summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-16 23:03:02 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-16 23:03:02 +0300
commit69c527de5717edc3c8faeb81fc03032f55e5f2f3 (patch)
tree20374e1fbf7f04611420f5f43e14150742041f0d
parent55b4f417e104d92a283ba166f310ca15fedd1f0f (diff)
downloadmanaplus-69c527de5717edc3c8faeb81fc03032f55e5f2f3.tar.gz
manaplus-69c527de5717edc3c8faeb81fc03032f55e5f2f3.tar.bz2
manaplus-69c527de5717edc3c8faeb81fc03032f55e5f2f3.tar.xz
manaplus-69c527de5717edc3c8faeb81fc03032f55e5f2f3.zip
Dont run video mode detection on unit tests.
-rw-r--r--src/client.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index bf1ccd3f5..b0e133ca1 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -347,8 +347,9 @@ void Client::gameInit()
ConfigManager::checkConfigVersion();
logVars();
Cpu::detect();
-#if defined(USE_OPENGL)
-#if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__)
+#if defined(USE_OPENGL)
+#if !defined(ANDROID) && !defined(__APPLE__) && \
+!defined(__native_client__) && !defined(UNITTESTS)
if (!settings.options.safeMode &&
settings.options.test.empty() &&
!config.getBoolValue("videodetected"))