empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Print messages to console if SDL is not initialized

Browse source
This commit is contained in:
Ilari Liusvaara 2011-09-19 22:37:16 +03:00
parent 8c8fc98d19
commit e96fadcd09
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SDL/window-sdl.cpp
View file

@ -467,6 +467,7 @@ extern uint32_t fontdata[];
namespace namespace
{ {
bool SDL_initialized = false;
uint32_t mouse_mask = 0; uint32_t mouse_mask = 0;
uint32_t vc_xoffset; uint32_t vc_xoffset;
uint32_t vc_yoffset; uint32_t vc_yoffset;
@ -1071,6 +1072,7 @@ namespace
void window::init() void window::init()
{ {
SDL_initialized = true;
signal(SIGALRM, sigalrm_handler); signal(SIGALRM, sigalrm_handler);
alarm(WATCHDOG_TIMEOUT); alarm(WATCHDOG_TIMEOUT);
init_keys(); init_keys();
@ -1147,6 +1149,7 @@ void window::quit()
SDL_Quit(); SDL_Quit();
sdl_init = false; sdl_init = false;
} }
SDL_initialized = false;
} }
bool window::modal_message(const std::string& msg, bool confirm) throw(std::bad_alloc) bool window::modal_message(const std::string& msg, bool confirm) throw(std::bad_alloc)
@ -1172,12 +1175,18 @@ void window::message(const std::string& msg) throw(std::bad_alloc)
size_t s = msg2.find_first_of("\n"); size_t s = msg2.find_first_of("\n");
std::string forlog; std::string forlog;
if(s >= msg2.length()) { if(s >= msg2.length()) {
messagebuffer[messagebuffer_next_seq++] = (forlog = msg2); if(SDL_initialized) {
system_log << forlog << std::endl; messagebuffer[messagebuffer_next_seq++] = (forlog = msg2);
system_log << forlog << std::endl;
} else
std::cerr << msg2 << std::endl;
break; break;
} else { } else {
messagebuffer[messagebuffer_next_seq++] = (forlog = msg2.substr(0, s)); if(SDL_initialized) {
system_log << forlog << std::endl; messagebuffer[messagebuffer_next_seq++] = (forlog = msg2.substr(0, s));
system_log << forlog << std::endl;
} else
std::cerr << msg2.substr(0, s) << std::endl;
msg2 = msg2.substr(s + 1); msg2 = msg2.substr(s + 1);
} }