diff options
| author |  Douman | 2024-05-05 00:59:08 +0900 |
|---|---|---|
| committer |  GitHub | 2024-05-04 17:59:08 +0200 |
| commit | 5d7d5ffa65cfeca4f67acfa9650e94da50a20b53 (patch) | |
| tree | 45eec86d8da56fae0704cbe4f870c18f4bc50484 /src | |
| parent | Add cmake option WANT_PERL_DOCS to disable doc generation. (#2635) (diff) | |
| download | KVIrc-5d7d5ffa65cfeca4f67acfa9650e94da50a20b53.tar.gz KVIrc-5d7d5ffa65cfeca4f67acfa9650e94da50a20b53.tar.bz2 KVIrc-5d7d5ffa65cfeca4f67acfa9650e94da50a20b53.zip | |
Set portable when it is needed (#2638)
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviApplication.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviApplication_setup.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index f661c8c24..b29f85f51 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -227,9 +227,6 @@ KviApplication::KviApplication(int & argc, char ** argv) kvi_socket_flushTrafficCounters(); // don't let qt quit the application by itself setQuitOnLastWindowClosed(false); -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - m_bPortable = KviFileUtils::fileExists(QString("%1%2%3").arg(g_pApp->applicationDirPath().arg(KVI_PATH_SEPARATOR_CHAR).arg("portable"))); -#endif //note: the early qApp->style() call leads to a crash on osx #if !defined(COMPILE_ENABLE_GTKSTYLE) && !defined(COMPILE_ON_MAC) diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp index a228b9f2f..19bfb9214 100644 --- a/src/kvirc/kernel/KviApplication_setup.cpp +++ b/src/kvirc/kernel/KviApplication_setup.cpp @@ -298,6 +298,8 @@ bool KviApplication::findLocalKvircDirectory() #endif //COMPILE_KDE_SUPPORT #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + const auto portable_file = QString("%1%2%3").arg(g_pApp->applicationDirPath()).arg(KVI_PATH_SEPARATOR_CHAR).arg("portable"); + m_bPortable = KviFileUtils::fileExists(portable_file); if(m_bPortable) { m_szLocalKvircDir = QString("%1%2%3").arg(g_pApp->applicationDirPath()).arg(KVI_PATH_SEPARATOR_CHAR).arg("Settings"); |