some fixes

8e647e5a · vvaltman · bd55cfdb · 8e647e5a · 8e647e5a · 5d1763f0
Commit 8e647e5a authored Apr 28, 2015 by vvaltman
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

interface.c interface.c +3 -5

loop.c loop.c +1 -0

tgl tgl +1 -1

No files found.
--- a/interface.c
+++ b/interface.c
@@ -1562,11 +1562,9 @@ void work_modifier (const char *s, int l) {
 }

 void print_fail (struct in_ev *ev) {
-  if (ev) {
-    mprint_start (ev);
-    mprintf (ev, "FAIL\n");
-    mprint_end (ev);
-  }
+  mprint_start (ev);
+  mprintf (ev, "FAIL\n");
+  mprint_end (ev);
 }

 void print_success (struct in_ev *ev) {

--- a/loop.c
+++ b/loop.c
@@ -648,6 +648,7 @@ void on_started (struct tgl_state *TLS) {
  if (wait_dialog_list) {
    wait_dialog_list = 0;
    tgl_do_get_dialog_list (TLS, 100, 0, dlist_cb, 0);
+    return;
  }
  #ifdef USE_LUA
    lua_diff_end ();

--- a/tgl @ 5d1763f0
+++ b/tgl @ 5d1763f0
-Subproject commit b75e2e9805c257b710d806564422e8b8c4b57cbf
+Subproject commit 5d1763f05a448c8a21abfd24e2c40ab1a912db56