Fix TKPATH setting for Windows

sassoftware · Oct 12, 2017 · 4bbf35c · 4bbf35c
1 parent 98c5462
commit 4bbf35c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/R/swat.R b/R/swat.R
@@ -118,10 +118,13 @@
       tryCatch(
          {
             library.dynam('rswat', pkg, lib)
-            if ( Sys.getenv('TKPATH') == '' && 
-                 (file.exists(file.path(lib, pkg, 'libs', 'tkmk.so')) ||
-                  file.exists(file.path(lib, pkg, 'libs', 'tkmk.dll'))) ) {
-               InitializeTK(file.path(lib, pkg, 'libs:'))
+            if ( Sys.getenv('TKPATH') == '' ) {
+               if ( file.exists(file.path(lib, pkg, 'libs', 'tkmk.so')) ) {
+                  InitializeTK(file.path(lib, pkg, 'libs:'))
+               }
+               else if ( file.exists(file.path(lib, pkg, 'libs', 'tkmk.dll')) ) {
+                  InitializeTK(file.path(lib, pkg, 'libs;'))
+               }
             }
          }
          , error=function(e) {