From f8e8d704b5ebd0025511f776d4acb0209384be6c Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Tue, 31 Dec 2013 17:23:15 -0500 Subject: [PATCH] use copy construction to pass the config along so the main constructor gets run once. --- src/eventthread.h | 4 +++- src/main.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/eventthread.h b/src/eventthread.h index 56423bf..490d3df 100644 --- a/src/eventthread.h +++ b/src/eventthread.h @@ -179,13 +179,15 @@ struct RGSSThreadData RGSSThreadData(EventThread *ethread, const char *argv0, - SDL_Window *window) + SDL_Window *window, + const Config& newconf) : rqTerm(false), rqTermAck(false), ethread(ethread), argv0(argv0), window(window), sizeResoRatio(1, 1), + config(newconf), rqScreenshot(false) {} }; diff --git a/src/main.cpp b/src/main.cpp index 3a251fe..049f5df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -293,8 +293,7 @@ int main(int, char *argv[]) } EventThread eventThread; - RGSSThreadData rtData(&eventThread, argv[0], win); - rtData.config = conf; + RGSSThreadData rtData(&eventThread, argv[0], win, conf); /* Start RGSS thread */ SDL_Thread *rgssThread =