From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 7 Oct 2015 23:36:41 +0000 (+0200)
Subject: Print out errors in the setup chain callback.
X-Git-Tag: 1.0.0~273
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=b407713785328f0a5e3a384b55823277b883aae0

Print out errors in the setup chain callback.
---

diff --git a/theme.cpp b/theme.cpp
index ceccdcf..09797a6 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -322,7 +322,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
 	lua_getglobal(L, "num_channels");
 
 	if (lua_pcall(L, 0, 1, 0) != 0) {
-		fprintf(stderr, "error running function `num_channels': %s", lua_tostring(L, -1));
+		fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1));
 		exit(1);
 	}
 
@@ -350,7 +350,7 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 	lua_pushnumber(L, height);
 
 	if (lua_pcall(L, 4, 2, 0) != 0) {
-		fprintf(stderr, "error running function `get_chain': %s", lua_tostring(L, -1));
+		fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1));
 		exit(1);
 	}
 
@@ -367,7 +367,10 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 
 		// Set up state, including connecting signals.
 		lua_rawgeti(L, LUA_REGISTRYINDEX, funcref);
-		lua_pcall(L, 0, 0, 0);
+		if (lua_pcall(L, 0, 0, 0) != 0) {
+			fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
+			exit(1);
+		}
 	});
 }
 
@@ -385,7 +388,7 @@ void Theme::transition_clicked(int transition_num, float t)
 	lua_pushnumber(L, t);
 
 	if (lua_pcall(L, 2, 0, 0) != 0) {
-		fprintf(stderr, "error running function `transition_clicked': %s", lua_tostring(L, -1));
+		fprintf(stderr, "error running function `transition_clicked': %s\n", lua_tostring(L, -1));
 		exit(1);
 	}
 }