From 49291811330624761600b91ad8d01abd4e9d4b96 Mon Sep 17 00:00:00 2001 From: Kyle K Date: Tue, 9 Aug 2011 20:02:12 -0500 Subject: sdl: mistook logical OR with conditional --- sdl/platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdl/platform.c b/sdl/platform.c index c4e11ca..7ed4f99 100644 --- a/sdl/platform.c +++ b/sdl/platform.c @@ -104,10 +104,10 @@ int load_config(struct platform *p) if (!p) return -1; - if (luaLoadConfig(p->L, "config.lua") || - luaFillTablePlatform(p->L, &p->config_table) != -1) + if ((luaLoadConfig(p->L, "config.lua") | + luaFillTablePlatform(p->L, &p->config_table)) != -1) { - /* print was was loaded from config.lua to stdout */ + /* print what was loaded from config.lua to stdout */ luaPrintTablePlatform(&p->config_table); /* override any globals that config.lua redefines */ -- cgit v1.2.3