disable shader cache by default on Windows

rstudio · Mar 20, 2020 · d006584 · d006584
1 parent ca43432
commit d006584
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
@@ -361,7 +361,6 @@ QString inferDefaultRenderingEngine()
       {
          if (deviceString.find(item) != std::string::npos)
          {
-            QCoreApplication::setAttribute(Qt::AA_DisableShaderDiskCache, true);
             return QStringLiteral("software");
          }
       }
@@ -390,6 +389,13 @@ void initializeRenderingEngine(std::vector<char*>* pArguments)
       engine = inferDefaultRenderingEngine();
    }
 
+#ifdef _WIN32
+   // disable the shader disk cache by default, as corrupt shaders can
+   // cause the IDE to hang and there is no simple way to detect or
+   // recover from that state
+   QCoreApplication::setAttribute(Qt::AA_DisableShaderDiskCache, true);
+#endif
+
    if (engine == QStringLiteral("desktop"))
    {
       QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);