Changeset 1026

Timestamp:

Jun 6, 2017, 2:56:15 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI do not crash on 0 bytes size or non existent smb.conf

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (7 diffs)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -12 +12 @@
 VRXWindow: __VREFileListWindow,1,3300,14695,2665,3358
 VRXWindow: __VRESectionListWindow,1,2867,14020,10889,5035
-VRXWindow: __VREToolsWindow,1,4011,4963,6992,1669
+VRXWindow: __VREToolsWindow,1,4011,4963,6986,1661
 VRXWindow: __VREWindListWindow,1,458,14695,4866,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_SMBTREE,1
 UserWindow: SW_ACLS,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -307 +307 @@
         parse var UserCred '--user='username'%%'password
         UserCred = '--user='username'%'password
-        say "  Strip double %%!!!"
+        call lineout "debug", "  Strip double %%!!!"
     end
 
@@ -2965 +2965 @@
 
     CALL _INILoad
+    if \VRFileExists(samba.!smbconf)|stream(samba.!smbconf,"c","query size") = 0 then do
+        call _CreateSmbConf
+    end
 
     call _TabFix 1
@@ -4566 +4569 @@
 */
 PB_SETTINGS_APPLY_Click:
+    if options.!debug == 1 then say time()' PB_SETTINGS_APPLY_Click() started'
     advanced.!loglevel    = VRGet("SPIN_LOG_LEVEL", "Value" )
     advanced.!logfile     = VRGet("EF_LOGFILE",    "Value" )
@@ -4579 +4583 @@
     options.!storecreds   = VRGet("CB_STORECREDS", "Set" )
     options.!debug        = VRGet("CB_DEBUG",      "Set" )
-
     if options.!debug == 1 then do /* Turn on additional columns in connection details view */
         ok = VRRedirectStdio("ON")
@@ -4591 +4594 @@
         ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 1)
         ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 1)
+
     end
     else do /* Turn on additional columns in connection details view */
@@ -4613 +4617 @@
         call _LMHostsUpdate
     end
+
     if advanced.!smbconfchanged = 1 then do
         name_resolve_order = VRGet("SPIN_NRO1","value")' 'VRGet("SPIN_NRO2","value")' 'VRGet("SPIN_NRO3","value")' 'VRGet("SPIN_NRO4","value")
@@ -4627 +4632 @@
     end
     if options.!storecreds = 0 then call Menu_File_ucCred_Reset_Click
+
+    if options.!debug == 1 then say time()' PB_SETTINGS_APPLY_Click() done'
 return