Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2022-03-16 12:14:08 +0300
committerGitHub <noreply@github.com>2022-03-16 12:14:08 +0300
commit681d0018de7b14238503d2d0b6311ac9a6d7b147 (patch)
treeec6acb201aab181747f73e49fa7ac172ff5f95e8 /src
parente909c239d7ed2f5473e9085ee5ec7fbc4ed68f26 (diff)
parent8a6b9019a62426535d0eec6e519641c3f650d59e (diff)
Merge PR #5596: FIX(client): Audio wizard being shown repeatedly
The switch to a new settings format messed up the setting for whether or not the audio wizard has been shown already or not. For new installations, the wizard would be shown, but the fact that it has been shown is not reflected in the settings causing the wizard to be re-shown upon a restart. This commit fixes this by making sure that the respective setting is set after the wizard has been shown for the first time.
Diffstat (limited to 'src')
-rw-r--r--src/mumble/main.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp
index a67dd62ef..772f25f7a 100644
--- a/src/mumble/main.cpp
+++ b/src/mumble/main.cpp
@@ -56,6 +56,8 @@
#include <QtGui/QDesktopServices>
#include <QtWidgets/QMessageBox>
+#include <memory>
+
#ifdef USE_DBUS
# include <QtDBus/QDBusInterface>
#endif
@@ -721,9 +723,10 @@ int main(int argc, char **argv) {
a.setQuitOnLastWindowClosed(false);
if (!Global::get().s.audioWizardShown) {
- AudioWizard *aw = new AudioWizard(Global::get().mw);
- aw->exec();
- delete aw;
+ auto wizard = std::make_unique< AudioWizard >(Global::get().mw);
+ wizard->exec();
+
+ Global::get().s.audioWizardShown = true;
}
if (!CertWizard::validateCert(Global::get().s.kpCertificate)) {