summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-10 23:25:51 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-10 23:25:51 +0300
commitb5a5f804e6beac792370a9aead9f951e67655b65 (patch)
treee20c6d6ab2b494c689552c2abc3cf22dbeec6ebb /src/progs
parent7fd1401d915ee91c808695ca1f3647ca7a258a1f (diff)
downloadmanaplus-b5a5f804e6beac792370a9aead9f951e67655b65.tar.gz
manaplus-b5a5f804e6beac792370a9aead9f951e67655b65.tar.bz2
manaplus-b5a5f804e6beac792370a9aead9f951e67655b65.tar.xz
manaplus-b5a5f804e6beac792370a9aead9f951e67655b65.zip
Fix loading icon two times.
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/dyecmd/client.cpp12
-rw-r--r--src/progs/manaplus/client.cpp12
2 files changed, 16 insertions, 8 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index a46227f08..ccc8a51af 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -246,11 +246,12 @@ void Client::gameInit()
eventsManager.enableEvents();
#ifdef WIN32
- Dirs::extractDataDir();
Dirs::mountDataDir();
#endif // WIN32
-
+#ifndef USE_SDL2
WindowManager::setIcon();
+#endif // USE_SDL2
+
ConfigManager::checkConfigVersion();
logVars();
Cpu::detect();
@@ -276,14 +277,14 @@ void Client::gameInit()
Dirs::updateDataPath();
- // Add the main data directories to our PhysicsFS search path
+ // Add the main data directories to our VirtFs search path
if (!settings.options.dataPath.empty())
{
VirtFs::mountDir(settings.options.dataPath,
Append_false);
}
- // Add the local data directory to PhysicsFS search path
+ // Add the local data directory to VirtFs search path
VirtFs::mountDir(settings.localDataDir,
Append_false);
TranslationManager::loadCurrentLang();
@@ -292,6 +293,9 @@ void Client::gameInit()
TranslationManager::loadGettextLang();
#endif // ENABLE_CUSTOMNLS
+#ifdef USE_SDL2
+ WindowManager::setIcon();
+#endif // USE_SDL2
WindowManager::initTitle();
mainGraphics->postInit();
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 6526fc82a..af46d8683 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -375,11 +375,12 @@ void Client::gameInit()
eventsManager.enableEvents();
#ifdef WIN32
- Dirs::extractDataDir();
Dirs::mountDataDir();
#endif // WIN32
-
+#ifndef USE_SDL2
WindowManager::setIcon();
+#endif // USE_SDL2
+
ConfigManager::checkConfigVersion();
logVars();
Cpu::detect();
@@ -411,14 +412,14 @@ void Client::gameInit()
Dirs::updateDataPath();
- // Add the main data directories to our PhysicsFS search path
+ // Add the main data directories to our VirtFs search path
if (!settings.options.dataPath.empty())
{
VirtFs::mountDir(settings.options.dataPath,
Append_false);
}
- // Add the local data directory to PhysicsFS search path
+ // Add the local data directory to VirtFs search path
VirtFs::mountDir(settings.localDataDir,
Append_false);
TranslationManager::loadCurrentLang();
@@ -427,6 +428,9 @@ void Client::gameInit()
TranslationManager::loadGettextLang();
#endif // ENABLE_CUSTOMNLS
+#ifdef USE_SDL2
+ WindowManager::setIcon();
+#endif // USE_SDL2
WindowManager::initTitle();
mainGraphics->postInit();