Use lazy (just-in-time) detection after loading Tolk or changing SAPI…

… settings.
dkager · Jan 8, 2016 · e63dd95 · e63dd95
1 parent f4ba181
commit e63dd95
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/Tolk.cpp b/src/Tolk.cpp
@@ -40,7 +40,6 @@ TOLK_DLL_DECLSPEC void TOLK_CALL Tolk_Load() {
   if (g_trySAPI)
     g_sapi = new ScreenReaderDriverSAPI();
   g_isLoaded = true;
-  Tolk_DetectScreenReader();
 }
 
 TOLK_DLL_DECLSPEC bool TOLK_CALL Tolk_IsLoaded() {
@@ -73,17 +72,14 @@ TOLK_DLL_DECLSPEC void TOLK_CALL Tolk_TrySAPI(bool trySAPI) {
       g_sapi = NULL;
     }
     g_currentScreenReaderDriver = NULL;
-    Tolk_DetectScreenReader();
   }
 }
 
 TOLK_DLL_DECLSPEC void TOLK_CALL Tolk_PreferSAPI(bool preferSAPI) {
   if (g_preferSAPI == preferSAPI) return;
   g_preferSAPI = preferSAPI;
-  if (Tolk_IsLoaded() && g_trySAPI && g_sapi) {
+  if (Tolk_IsLoaded() && g_trySAPI && g_sapi)
     g_currentScreenReaderDriver = NULL;
-    Tolk_DetectScreenReader();
-  }
 }
 
 TOLK_DLL_DECLSPEC const wchar_t * TOLK_CALL Tolk_DetectScreenReader() {