summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-08 17:11:06 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-08 17:11:06 +0300
commita80a1c69f8a5f4db88ade16e3b9d53f7b648be47 (patch)
treed8fe25f8aca2b62f2c93f7eb264eabffa85b8959 /src/gui
parentc70431d73da9c821cfedbd162c7d2447b7057459 (diff)
downloadmanaplus-a80a1c69f8a5f4db88ade16e3b9d53f7b648be47.tar.gz
manaplus-a80a1c69f8a5f4db88ade16e3b9d53f7b648be47.tar.bz2
manaplus-a80a1c69f8a5f4db88ade16e3b9d53f7b648be47.tar.xz
manaplus-a80a1c69f8a5f4db88ade16e3b9d53f7b648be47.zip
Get from video detection texture compression and texture sampler modes.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/setup_video.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 5157f8e9f..35293fec4 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -50,6 +50,8 @@
#include "utils/gettext.h"
+#include "test/testmain.h"
+
#include <guichan/key.hpp>
#include <guichan/listmodel.hpp>
@@ -559,9 +561,14 @@ void Setup_Video::action(const gcn::ActionEvent &event)
}
else if (id == "detect")
{
- const int val = graphicsManager.startDetection();
- if (val >= 0 && val <= 2)
- mOpenGLDropDown->setSelected(val);
+ TestMain *test = graphicsManager.startDetection();
+ if (test)
+ {
+ const int val = test->getConfig().getValueInt("opengl", -1);
+ if (val >= 0 && val <= 2)
+ mOpenGLDropDown->setSelected(val);
+ delete test;
+ }
}
}