1 files changed, 10 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2743eeb..e998eed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,6 +95,16 @@ int main(int argc, char *argv[])
     qDebug() << ":/data/translations/ao_" + p_language;
   }
 
+  // Instead of quitting before even starting, we should notify the user
+  // and block the keyring (and cryptography in general). Or, at least, show
+  // the popup window before exiting.
+  if (keyring_initialize())
+  {
+    qCritical() << "libsodium failed to initialize. Catastrophic failure.";
+    return EXIT_FAILURE;
+  }
+  main_app.keyring_model.load_keys();
+
   main_app.construct_lobby();
   main_app.net_manager->get_server_list();
   main_app.net_manager->send_heartbeat();