Changeset 159 for trunk/src/DBwrapper.cpp

Timestamp:

09/26/2008 11:32:18 AM (4 years ago)

Author:

guyru

Message:

• Import settings and highscores to new configuration class.
• Fix segementation fault caused by trying to close an unopened db in DBwrapper destructor.

File:

• trunk/src/DBwrapper.cpp (modified) (6 diffs)

trunk/src/DBwrapper.cpp

@@ -41 +41 @@
 {
         m_errmsg=0; //set the pointer to null
+        db_loaded = false;
         
         m_errorcode = sqlite3_open(filename.c_str(), &m_db);
@@ -46 +47 @@
         if (m_errorcode!=SQLITE_OK)
                 cerr<<"ERROR: couldn't open database (DBhandler constructor). filename: "<< filename<<endl;
+        
+        db_loaded = true;
 
 }
@@ -55 +58 @@
 */
 DBwrapper::DBwrapper(){
-
+        db_loaded = false;
 }
 
@@ -64 +67 @@
 DBwrapper::~DBwrapper()
 {
-        sqlite3_close(m_db);
+        if (db_loaded) {
+                sqlite3_close(m_db);
+        }
 }
 
@@ -148 +153 @@
 int DBwrapper::Open( std::string filename )
 {
+        db_loaded = false;
         m_errorcode = sqlite3_open(filename.c_str(), &m_db);
         
@@ -153 +159 @@
                 cerr<<"ERROR: couldn't open database (DBhandler constructor). filename: "<< filename<<endl;
         
+        db_loaded = true;
         return m_errorcode;
 }