diff options
author | Popkornium18 <mail@popkornium18.de> | 2020-07-31 21:18:51 +0300 |
---|---|---|
committer | Popkornium18 <mail@popkornium18.de> | 2020-08-04 21:38:33 +0300 |
commit | 4edae462fa74fecc42377604c0405480c6c24f83 (patch) | |
tree | c0d14542c3eeaa14d092f06533691ac858ebe352 /src/mumble/Database.h | |
parent | 3a07016b8fb4f902b778c1d74cbb13cab25fa93a (diff) |
FEAT(client): Allow specifying config file via commandline switch
This adds the switch -c/--config to the mumble client. If -c is
followed by a filename, this file will be read instead of the
standard config. A new config option database= has been added to
the 'General' section of the ini file. This can be used to specify
a different database which is necessary to run multiple completely
separate Mumble instances at the same time.
Additionaly the (undocumented) function to merge another ini file
by providing it as a parameter has been removed as it was
conflicting with the added functionality.
FIXES #3953
Diffstat (limited to 'src/mumble/Database.h')
-rw-r--r-- | src/mumble/Database.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mumble/Database.h b/src/mumble/Database.h index 3e626c044..569e38fa3 100644 --- a/src/mumble/Database.h +++ b/src/mumble/Database.h @@ -25,6 +25,10 @@ class Database : public QObject { Q_DISABLE_COPY(Database) QSqlDatabase db; + /// This function is called when no database location is configured + /// in the config file. It tries to find an existing database file and + /// creates a new one if none was found. + bool findOrCreateDatabase(); public: Database(const QString &dbname); ~Database() Q_DECL_OVERRIDE; |