Changeset 4cf7b1b

Timestamp:

Sep 18, 2010, 3:17:27 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

7ba2ad4

Parents:

6425d43

git-author:

David Benjamin <davidben@mit.edu> (07/31/10 20:11:47)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:17:27)

Message:

If owl_popwin_up fails, abort the command

Files:

• functions.c (modified) (2 diffs)
• popexec.c (modified) (1 diff)

functions.c

@@ -1240 +1240 @@
   v=owl_global_get_viewwin(&g);
 
-  owl_popwin_up(pw);
+  if (owl_popwin_up(pw) != 0) {
+    owl_function_error("Popwin already in use.");
+    return;
+  }
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), text);
@@ -1253 +1256 @@
   v=owl_global_get_viewwin(&g);
 
-  owl_popwin_up(pw);
+  if (owl_popwin_up(pw) != 0) {
+    owl_function_error("Popwin already in use.");
+    return;
+  }
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_fmtext(v, owl_popwin_get_content(pw), fm);

popexec.c

@@ -26 +26 @@
   pe->vwin=v=owl_global_get_viewwin(&g);
 
-  owl_popwin_up(pw);
+  if (owl_popwin_up(pw) != 0) {
+    owl_function_error("Popwin already in use.");
+    return NULL;
+  }
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), "");