diff options
| author |  TheXception | 2009-04-22 23:07:02 +0000 |
|---|---|---|
| committer | TheXception | 2009-04-22 23:07:02 +0000 |
| commit | 949c282f72b2d39a3f1c3a65de50ad2cad19cbe9 (patch) | |
| tree | f7c7648704ce38149aecd8c591eb649029bfddee /src | |
| parent | updated german translations (diff) | |
| download | KVIrc-949c282f72b2d39a3f1c3a65de50ad2cad19cbe9.tar.gz KVIrc-949c282f72b2d39a3f1c3a65de50ad2cad19cbe9.tar.bz2 KVIrc-949c282f72b2d39a3f1c3a65de50ad2cad19cbe9.zip | |
possible portable fix (win32, needs testing)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3180 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/kvi_app.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app.h | 3 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 6a36fa82b..df77af38f 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -208,6 +208,9 @@ void KviApp::internalInit() // next step is setup() m_bSetupDone = false; kvi_socket_flushTrafficCounters(); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + m_bPortable = KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable"); +#endif } void KviApp::setup() diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 174f54a8e..d07112bd7 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -96,6 +96,9 @@ protected: QString m_szLocalKvircDir; int m_iHeartbeatTimerId; bool m_bFirstTimeRun; +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + bool m_bPortable; +#endif KviWindow * m_pActiveWindow; bool m_bUpdateGuiPending; KviPointerList<KviPendingAvatarChange> * m_pPendingAvatarChanges; diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 2e7751af7..b785678b3 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -671,7 +671,7 @@ bool KviApp::findLocalKvircDirectory() #endif //COMPILE_KDE_SUPPORT #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - if(KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable")) { + if(m_bPortable) { m_szLocalKvircDir=g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Settings"; if(checkLocalKvircDirectory(m_szLocalKvircDir)) return true; } @@ -726,6 +726,9 @@ void KviApp::loadDirectories() m_bFirstTimeRun = !findLocalKvircDirectory(); if(m_bFirstTimeRun)setupBegin(); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + if (m_bPortable) return; +#endif if(!checkFileAssociations()) setupFileAssociations(); if(!checkUriAssociations("irc")) setupUriAssociations("irc"); if(!checkUriAssociations("ircs")) setupUriAssociations("ircs"); |