diff options
| -rw-r--r-- | xbmc/dbwrappers/Database.cpp | 6 | ||||
| -rw-r--r-- | xbmc/dbwrappers/Database.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp index 0ee901be9d..ed9455688b 100644 --- a/xbmc/dbwrappers/Database.cpp +++ b/xbmc/dbwrappers/Database.cpp @@ -253,8 +253,10 @@ bool CDatabase::Open() return Open(db_fallback); } -bool CDatabase::Open(DatabaseSettings &dbSettings) +bool CDatabase::Open(const DatabaseSettings &settings) { + // take a copy - we're gonna be messing with it and we don't want to touch the original + DatabaseSettings dbSettings = settings; if (IsOpen()) { m_openCount++; @@ -330,7 +332,7 @@ bool CDatabase::Open(DatabaseSettings &dbSettings) return false; } -bool CDatabase::Connect(DatabaseSettings &dbSettings, bool create) +bool CDatabase::Connect(const DatabaseSettings &dbSettings, bool create) { // create the appropriate database structure if (dbSettings.type.Equals("sqlite3")) diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h index bf53de91bf..65962e0476 100644 --- a/xbmc/dbwrappers/Database.h +++ b/xbmc/dbwrappers/Database.h @@ -42,7 +42,7 @@ public: bool Compress(bool bForce=true); void Interupt(); - bool Open(DatabaseSettings &db); + bool Open(const DatabaseSettings &db); void BeginTransaction(); virtual bool CommitTransaction(); @@ -126,7 +126,7 @@ protected: std::auto_ptr<dbiplus::Dataset> m_pDS2; private: - bool Connect(DatabaseSettings &db, bool create); + bool Connect(const DatabaseSettings &db, bool create); bool UpdateVersionNumber(); bool m_bMultiWrite; /*!< True if there are any queries in the queue, false otherwise */ |