Changeset 1049

Timestamp:

Jan 24, 2018, 9:28:22 PM (8 years ago)

Author:

Alex Taylor

Message:

Merge changeset 1045 from trunk.

Location:

branches/guitools-arcamap-2.5/evfsgui

Files:

• evfsgui.vrx (modified) (8 diffs)
• rc/lang/evfsi_en.mkm (modified) (1 diff)

branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrx

@@ -685 +685 @@
 _Dynamic:
     dyn_code = arg(1)
-    if options.!debug == 1 then say '  Dynamic code: 'dyn_code
+    if options.!debug == 1 then say time()'  Dynamic code: 'dyn_code
     interpret dyn_code; drop dyn_code
 return
@@ -3854 +3854 @@
 
     /* Attach the virtual drive - only if drive is not already attached */
+    NewlyAttached = 0
     if pos(vfs.!drive,MyFreeDriveMap("C:","FREE")) > 0 then do
         CALL _Dynamic "ok = "fs.!prefix"RxAttach('"vfs.!drive"')"
-
+        NewlyAttached = 1 /* fixes AN Ticket 1654 */
         if options.!debug == 1 then say time()' '||'Attach "'vfs.!drive'" =' ok
     end
@@ -3958 +3959 @@
 
         /* In case the mountpoint was created for this failed operation, it is (optionally) removed again */
+        say "CreateMP="createMP
+        say "advanced.!alwaysmp="advanced.!alwaysmp
         if CreateMP = 0 & advanced.!alwaysmp <> 1 then do
             CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint('"vfs.!mountpoint"')"
             if options.!debug == 1 then say time()' '||'Remove "'vfs.!mountpoint'" = 'ok
+            if NewlyAttached = 1 then do /* Also detach drive - fixes AN Ticket 1654 */
+                CALL _Dynamic "ok = "fs.!prefix"RxDetach('"vfs.!drive"')"
+                if options.!debug == 1 then say time()' '||'Also try to detach "'vfs.!drive'" ok = 'ok
+            end
         end
     end
@@ -3970 +3977 @@
     end
     drop CreateMP /* not required anymore */
+    drop NewlyAttached /* not required anymore */
 
 /*  Obsolete - the IOCtl will not be implemented this way in the plugin
@@ -4466 +4474 @@
     END
 
-    options.!user     = userid
-    options.!password = password
+    options.!user      = userid
+    options.!password  = password
+/* fix for AN Ticket #1653 */
+    options.!spassword = c2x(options.!password)
 
     vfs.!drive      = mdrive
@@ -5054 +5064 @@
 SW_ADVANCED_Init:
     /* Title bar */
-    CALL NLVSetText "SW_ADVANCED",  "Caption", 40
+    CALL NLVSetText "SW_ADVANCED",      "Caption", 40
 
     /* Options */
-    CALL NLVSetText "GB_ADVANCED",          "Caption", 43
+    CALL NLVSetText "GB_ADVANCED",      "Caption", 43
     CALL NLVSetText "CB_EAS",           "Caption", 44
     CALL NLVSetText "CB_READONLY",      "Caption", 45
@@ -5083 +5093 @@
 */
 SW_ADVANCED_Init_Content:
-    IF advanced.!easupport     \= "" THEN ok = VRSet("CB_EAS",     "Set",   advanced.!easupport)
-    IF advanced.!readonly      \= "" THEN ok = VRSet("CB_READONLY","Set",   advanced.!readonly)
-    IF advanced.!alwaysmp      \= "" THEN ok = VRSet("CB_ALWAYSMP","Set",   advanced.!alwaysmp)
+    IF advanced.!easupport     \= "" THEN ok = VRSet("CB_EAS",              "Set",   advanced.!easupport)
+    IF advanced.!readonly      \= "" THEN ok = VRSet("CB_READONLY",         "Set",   advanced.!readonly)
+    IF advanced.!alwaysmp      \= "" THEN ok = VRSet("CB_ALWAYSMP",         "Set",   advanced.!alwaysmp)
     IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT",   "Value", advanced.!cachetimeout)
     IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS",  "Value", advanced.!cachelistings)
@@ -5092 +5102 @@
     IF advanced.!encryption    \= "" THEN ok = VRSet("CB_ENCRYPTION",       "Set",   advanced.!encryption)
     /* Obsolete */
-    IF advanced.!memlen        \= "" THEN ok = VRSet("SPB_MEMLEN", "Value", advanced.!memlen)
+    IF advanced.!memlen        \= "" THEN ok = VRSet("SPB_MEMLEN",          "Value", advanced.!memlen)
 return
 

branches/guitools-arcamap-2.5/evfsgui/rc/lang/evfsi_en.mkm

@@ -113 +113 @@
 EVG0104I: SMB.PDR is not installed.
 EVG0105I: No SMB ports installed.
-EVG0106I: Port is installked an configured, but not used by any printer.
+EVG0106I: Port is installed and configured, but not used by any printer.
 EVG0107I: Welcome %1!
 EVG0108?: