fix self-test problems in QtSLiM

Author: bhaller

QtSLiM/QtSLiMWindow.cpp

@@ -395,6 +395,14 @@ void QtSLiMWindow::init(void)
     // Instantiate the help panel up front so that it responds instantly; slows down our launch, but it seems better to me...
     QtSLiMHelpWindow::instance();
 
+	// Allocate a RNG temporarily, so it exists when we create the console controller and run self-tests
+    // This is just for the duration of this init() method; we will tear it down again below
+    if (!sim_RNG_initialized)
+    {
+        _Eidos_InitializeOneRNG(sim_RNG);
+        sim_RNG_initialized = true;
+    }
+    
     // Create our console window; we want one all the time, so that it keeps live symbols for code completion for us
     if (!consoleController)
     {
@@ -467,6 +475,13 @@ void QtSLiMWindow::init(void)
 
         beenHere = true;
     }
+    
+    // Tear down the temporary RNG that we created above
+    if (sim_RNG_initialized)
+	{
+		_Eidos_FreeOneRNG(sim_RNG);
+		sim_RNG_initialized = false;
+	}
 }
 
 void QtSLiMWindow::interpolateVerticalSplitter(void)
@@ -4405,6 +4420,9 @@ void QtSLiMWindow::willExecuteScript(void)
     if (gEidos_RNG_Initialized)
         qDebug() << "eidosConsoleWindowControllerWillExecuteScript: gEidos_rng already set up!";
 
+    if (!sim_RNG_initialized)
+        qDebug() << "sim_RNG is not yet set up!";
+    
 	std::swap(sim_RNG, gEidos_RNG_SINGLE);
 	std::swap(sim_RNG_initialized, gEidos_RNG_Initialized);
 

eidos/eidos_functions_files.cpp

@@ -309,19 +309,18 @@ EidosValue_SP Eidos_ExecuteFunction_writeFile(const std::vector<EidosValue_SP> &
 #ifdef SLIMGUI
 	// we need to provide SLiMgui with information about the file write we just did; this is gross, but it wants to know
 	// we make a separate buffer for this purpose, with string copies, to donate to Community with &&
+	EidosContext *context = p_interpreter.Context();
+	
+	if (context)
 	{
-		EidosContext *context = p_interpreter.Context();
 		std::vector<std::string> slimgui_buffer;
 
 		slimgui_buffer.reserve(contents_count);
 
 		for (int value_index = 0; value_index < contents_count; ++value_index)
 			slimgui_buffer.emplace_back(contents_value->StringRefAtIndex_NOCAST(value_index, nullptr));
 
-		if (context)
-			context->FileWriteNotification(file_path, std::move(slimgui_buffer), append);
-		else
-			EIDOS_TERMINATION << "ERROR (Eidos_ExecuteFunction_writeFile): (internal error) no Context in Eidos_ExecuteFunction_writeFile()." << EidosTerminate(nullptr);
+		context->FileWriteNotification(file_path, std::move(slimgui_buffer), append);
 	}
 #endif
 
@@ -373,8 +372,10 @@ EidosValue_SP Eidos_ExecuteFunction_writeTempFile(const std::vector<EidosValue_S
 #ifdef SLIMGUI
 	// we need to provide SLiMgui with information about the file write we just did; this is gross, but it wants to know
 	// we make a separate buffer for this purpose, with string copies, to donate to Community with &&
+	EidosContext *context = p_interpreter.Context();
+	
+	if (context)
 	{
-		EidosContext *context = p_interpreter.Context();
 		std::string file_path(file_path_cstr);
 		std::vector<std::string> slimgui_buffer;
 
@@ -383,10 +384,7 @@ EidosValue_SP Eidos_ExecuteFunction_writeTempFile(const std::vector<EidosValue_S
 		for (int value_index = 0; value_index < contents_count; ++value_index)
 			slimgui_buffer.emplace_back(contents_value->StringRefAtIndex_NOCAST(value_index, nullptr));
 
-		if (context)
-			context->FileWriteNotification(file_path, std::move(slimgui_buffer), false);
-		else
-			EIDOS_TERMINATION << "ERROR (Eidos_ExecuteFunction_writeTempFile): (internal error) no Context in Eidos_ExecuteFunction_writeTempFile()." << EidosTerminate(nullptr);
+		context->FileWriteNotification(file_path, std::move(slimgui_buffer), false);
 	}
 #endif