use copy construction to pass the config along so the main constructor gets run once.
This commit is contained in:
		
							parent
							
								
									f2bb0b2e79
								
							
						
					
					
						commit
						f8e8d704b5
					
				
					 2 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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)
 | 
			
		||||
	{}
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 =
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue