Changeset 31

Timestamp:

Apr 17, 2013, 6:02:19 PM (12 years ago)

Author:

Alex Taylor

Message:

Fix bug in saving network dialog fields.

File:

• trunk/gui/printer/cupswiz/cupswiz.VRX (modified) (5 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRX ¶

@@ -477 +477 @@
 /*:VRX         EF_SERVER_LostFocus
 */
-EF_SERVER_LostFocus: PROCEDURE EXPOSE globals.
+EF_SERVER_LostFocus: PROCEDURE EXPOSE globals. network_dialog
 
     idx = VRGet('DDCB_PROTOCOL', 'Selected')
@@ -488 +488 @@
 
     IF GetCupsQueues( server ) == 0 THEN RETURN
+
+    /* Sanity check to make sure the dialog wasn't dismissed before lpstat returned */
+    IF network_dialog <> 1 THEN RETURN
+
     CALL VRMethod 'DDCB_CUPSQUEUES', 'AddStringList', 'cupsdest.'
 RETURN
@@ -1349 +1353 @@
     server = STRIP( VRGet("EF_SERVER",      "Value"))
     pqueue = STRIP( VRGet("EF_QUEUE",       "Value"))
-    cqueue = STRIP( VRGet("DDCB_CUPSQUEUE", "Value"))
+    cqueue = STRIP( VRGet("DDCB_CUPSQUEUES","Value"))
     userid = STRIP( VRGet("EF_USERID",      "Value"))
     passwd = STRIP( VRGet("EF_PASSWORD",    "Value"))
@@ -1974 +1978 @@
 */
 SW_NETWORK_Fini:
+
+    network_dialog = 0
+
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -1981 +1988 @@
 */
 SW_NETWORK_Init:
+
+    /* Flag to keep track of whether dialog is open */
+    network_dialog = 1
 
     CALL NLSSetText 'SW_NETWORK',   'Caption',  80    /* 80: Network Printer */