3 files changed, 16 insertions, 10 deletions
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 8ae48632f..8cef633e1 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -192,7 +192,7 @@ SetupWizard::SetupWizard()
 	ed->setWordWrapMode(QTextOption::NoWrap);
 	QString szLicense;
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "COPYING");
+	g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "ABOUT-LICENSE");
 	if(!KviFileUtils::loadFile(szLicensePath, szLicense))
 	{
 		szLicense = __tr("Oops! Can't find the license file.\n"
@@ -806,7 +806,7 @@ void SetupWizard::makeLink()
 	       0, KEY_QUERY_VALUE, &hCU)
 	    == ERROR_SUCCESS)
 	{
-		RegQueryValueEx(hCU, TEXT("Desktop"), NULL, &lpType,
+		RegQueryValueEx(hCU, TEXT("Desktop"), nullptr, &lpType,
 		    (unsigned char *)&szLink, &ulSize);
 		RegCloseKey(hCU);
 	}
@@ -819,13 +819,13 @@ void SetupWizard::makeLink()
 	szKvircExec.append("\\kvirc.exe");
 
 	// Trigger a horrible machinery
-	CoInitialize(NULL); // we need COM+OLE
+	CoInitialize(nullptr); // we need COM+OLE
 
 	// Fiddle with an obscure shell interface
 	IShellLink * psl;
 
 	// Get a pointer to the IShellLink interface: this is kinda ugly :)
-	if(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+	if(CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER,
 	       IID_IShellLink, (void **)&psl)
 	    == S_OK)
 	{
@@ -1019,9 +1019,7 @@ void SetupWizard::accept()
 		// Make local->global link
 		QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir);
 		unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data());
-		int dummy; // make gcc happy
-		dummy = symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(), QTextCodec::codecForLocale()->fromUnicode(localPath).data());
-		Q_UNUSED(dummy);
+		(void)symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(), QTextCodec::codecForLocale()->fromUnicode(localPath).data());
 #endif
 
 #ifdef COMPILE_KDE_SUPPORT
diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h
index 9cec49c09..be71335a7 100644
--- a/src/modules/setup/SetupWizard.h
+++ b/src/modules/setup/SetupWizard.h
@@ -137,14 +137,14 @@ public:
 protected:
 	void makeLink();
 	void setUrlHandlers();
-	virtual void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 	void enableOrDisableIdentityPageNextButton();
 public slots:
 	void chooseOldDataPath();
 	void chooseDataPath();
 	void chooseIncomingPath();
-	virtual void accept();
-	virtual void reject();
+	void accept() override;
+	void reject() override;
 
 	void oldDirClicked();
 	void newDirClicked();
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 606ca9ac6..4c576e3a8 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -33,10 +33,13 @@
 #include "KviWindow.h"
 #include "KviTheme.h"
 #include "KviIrcServerDataBase.h"
+#include "KviModuleManager.h"
 
 #include <QString>
 #include <QFile>
 
+extern KVIRC_API KviModuleManager * g_pModuleManager;
+
 // this will be chosen during the setup process
 QString g_szChoosenIncomingDirectory;
 int g_iThemeToApply = THEME_APPLY_NONE;
@@ -117,6 +120,11 @@ KVIMODULEEXPORTFUNC void setup_finish()
 			delete pParams;
 			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true;
 		}
+
+		// detect the most appropriate sound system
+		KviModule * m = g_pModuleManager->getModule("snd");
+		if(m)
+			m->ctrl("detectSoundSystem", nullptr);
 	}
 }