Changeset 146 for trunk/orca

Timestamp:

05/11/06 17:36:18 (3 years ago)

Author:

krobillard

Message:

Orca-Qt - catchExit() works again after [140]

Location:

trunk/orca

Files:

• ovalue.c (modified) (1 diff)
• qt/qorca.cpp (modified) (7 diffs)

trunk/orca/ovalue.c

@@ -2575 +2575 @@
     {
     int total = funcv.argc + funcv.refc;
-    int level = data->used;
-
-    // NOTE: Natives may need to orHold() any complex argument values since
-    // the stack no longer references them here.
+    //int level = data->used;
 
     funcv.native.addr( DATA_TOP - total );
-    assert( level == data->used );
+
+    //assert( level == data->used );    // May not be same if orErrorThrown
     data->used -= total;
     }

trunk/orca/qt/qorca.cpp

@@ -683 +683 @@
 
 
-static int catchExit()
+static int catchExit( OValue* a1 )
 {
     if( orErrorThrown && orErrorIsType( OR_ERROR_THROW ) )
@@ -689 +689 @@
         if( orErrorThrown->error.msg == qEnv.atom_exec_exit )
         {
-            orCopyV( orTOS, *(orErrorThrown + 1) );
+            orCopyV( a1, *(orErrorThrown + 1) );
             orErrorClear;
             return qEnv.atom_exec_exit;
@@ -695 +695 @@
         else if( orErrorThrown->error.msg == qEnv.atom_close )
         {
-            orCopyV( orTOS, *(orErrorThrown + 1) );
+            orCopyV( a1, *(orErrorThrown + 1) );
             orErrorClear;
             return qEnv.atom_close;
@@ -719 +719 @@
                 qEnv.dialog = saveDialog;
 
-                catchExit();
+                catchExit( a1 );
             }
             else if( rec->type == WT_Widget )
@@ -727 +727 @@
                 widget->show();
                 qEnv.loop->exec();
-                if( catchExit() == qEnv.atom_close )
+                if( catchExit( a1 ) == qEnv.atom_close )
                     widget->hide();
             }
@@ -745 +745 @@
         // Update.
         qEnv.loop->processEvents();
-        catchExit();
+        catchExit( a1 );
     }
 }
@@ -796 +796 @@
             // Update.
             qEnv.loop->processEvents();
-            catchExit();
+            catchExit( a1 );
         }
     }