Fixed bug where MUSHclient would crash on startup if prefs database l…

…ocked

MUSHclient.cpp

@@ -1857,6 +1857,10 @@ CTextDocument * CMUSHclientApp::FindNotepad (const CString strTitle)
   {
 CTextDocument * pTextDoc = NULL;
 
+  // during startup, may not exist
+  if (App.m_pNormalDocTemplate == NULL)
+    return NULL;
+
   for (POSITION docPos = App.m_pNormalDocTemplate->GetFirstDocPosition();
       docPos != NULL; )
     {
@@ -2095,11 +2099,14 @@ void CMUSHclientApp::db_show_error (const char * sql)
    return;
 
   CString  strTitle = "SQL errors in global preferences";
+  CString  strMessage = CFormat ("SQL error on statement:\r\n\"%s\"\r\n%s\r\n", sql, sqlite3_errmsg(db));
 
-  AppendToTheNotepad (strTitle, 
-                      CFormat ("SQL error on statement:\r\n\"%s\"\r\n%s\r\n", sql, sqlite3_errmsg(db)),             
+  if (!AppendToTheNotepad (strTitle, 
+                      strMessage,             
                       false,   // append
-                      eNotepadWorldLoadError);
+                      eNotepadWorldLoadError))
+    // emergency fallback
+    ::AfxMessageBox ( (LPCTSTR) strMessage, MB_ICONEXCLAMATION );
 
   // make sure they see it
   ActivateNotepad (strTitle);

Utilities.cpp

@@ -255,6 +255,9 @@ bool CreateTextWindow (const char * sText,
                        const int iLines,
                        const int iNotepadType)
   {
+  // during startup, may not exist
+  if (App.m_pNormalDocTemplate == NULL)
+     return false;
 
   CTextDocument * pNewDoc = (CTextDocument *)
     App.m_pNormalDocTemplate->OpenDocumentFile(NULL);