Have Library_State's constructor thrown an exception if the

mutex_factory argument is NULL.

Have Init::initialize() pass either a new Mutex_Factory (the
default no-op version), or the result of modules.mutex_factory(),
depending on the value of args.thread_safe()

1 files changed, 3 insertions, 9 deletions

diff --git a/src/init_def.cpp b/src/init_def.cpp
index 6575f61bb..21cc07aaa 100644
--- a/src/init_def.cpp
+++ b/src/init_def.cpp
@@ -39,16 +39,10 @@ void initialize(const InitializerOptions& args)
    {
    Builtin_Modules modules(args.secure_memory());
 
-   Mutex_Factory* mutex_factory = 0;
+   set_global_state(
+      new Library_State(
+         args.thread_safe() ? modules.mutex_factory() : new Mutex_Factory));
 
-   if(args.thread_safe())
-      {
-      mutex_factory = modules.mutex_factory();
-      if(!mutex_factory)
-         throw Exception("LibraryInitializer: thread safety impossible");
-      }
-
-   set_global_state(new Library_State(mutex_factory));
    global_state().config().load_defaults();
    if(args.config_file() != "")
       global_config().load_inifile(args.config_file());