diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index d59960c2a2..1a60f0b9fb 100644
a
|
b
|
void MythMainWindow::Init(QString forcedpainter, bool mayReInit) |
1122 | 1122 | } |
1123 | 1123 | |
1124 | 1124 | QString painter = forcedpainter.isEmpty() ? |
1125 | | GetMythDB()->GetSetting("ThemePainter", QT_PAINTER) : forcedpainter; |
| 1125 | GetMythDB()->GetSetting("ThemePainter", AUTO_PAINTER) : forcedpainter; |
1126 | 1126 | #ifdef _WIN32 |
1127 | 1127 | if (painter == AUTO_PAINTER || painter == D3D9_PAINTER) |
1128 | 1128 | { |
… |
… |
void MythMainWindow::Init(QString forcedpainter, bool mayReInit) |
1152 | 1152 | } |
1153 | 1153 | else |
1154 | 1154 | # endif |
1155 | | if ( |
1156 | | #ifdef USE_OPENGL_QT5 |
1157 | | // The Qt5 OpenGL painter doesn't render all screens correctly (yet) |
1158 | | // so only use OpenGL if explicitly requested |
1159 | | #else |
1160 | | (painter == AUTO_PAINTER && (!d->painter && !d->paintwin)) || |
1161 | | #endif |
1162 | | painter.contains(OPENGL_PAINTER)) |
| 1155 | if ((!d->painter && !d->paintwin) && |
| 1156 | (painter == AUTO_PAINTER || painter.contains(OPENGL_PAINTER))) |
1163 | 1157 | { |
1164 | 1158 | MythRenderOpenGL *gl = MythRenderOpenGL::Create(painter); |
1165 | 1159 | d->render = gl; |
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 0bb2bf81bc..83f8729e01 100644
a
|
b
|
static HostComboBoxSetting *ThemePainter() |
2638 | 2638 | |
2639 | 2639 | gc->setLabel(AppearanceSettings::tr("Paint engine")); |
2640 | 2640 | |
2641 | | gc->addSelection(QCoreApplication::translate("(Common)", "Qt"), QT_PAINTER); |
2642 | 2641 | gc->addSelection(QCoreApplication::translate("(Common)", "Auto", "Automatic"), |
2643 | 2642 | AUTO_PAINTER); |
| 2643 | #ifdef _WIN32 |
| 2644 | gc->addSelection(QCoreApplication::translate("(Common)", "Direct3D"), |
| 2645 | D3D9_PAINTER); |
| 2646 | #endif |
2644 | 2647 | #if defined USING_OPENGL && ! defined USING_OPENGLES |
2645 | 2648 | gc->addSelection(QCoreApplication::translate("(Common)", "OpenGL 2"), |
2646 | 2649 | OPENGL2_PAINTER); |
2647 | 2650 | gc->addSelection(QCoreApplication::translate("(Common)", "OpenGL 1"), |
2648 | 2651 | OPENGL_PAINTER); |
2649 | 2652 | #endif |
2650 | | #ifdef _WIN32 |
2651 | | gc->addSelection(QCoreApplication::translate("(Common)", "Direct3D"), |
2652 | | D3D9_PAINTER); |
2653 | | #endif |
| 2653 | gc->addSelection(QCoreApplication::translate("(Common)", "Qt"), QT_PAINTER); |
2654 | 2654 | gc->setHelpText( |
2655 | 2655 | AppearanceSettings::tr("This selects what MythTV uses to draw. " |
2656 | 2656 | "Choosing '%1' is recommended, unless running " |