r518: *** empty log message ***

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 95ca5e7c4c8ab2f78952dc8b27c77b1c3cdd945a..a2fede76dfbf0613903309dc169fc6402509fb29 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 kevin Exp $
+**  $Id: ctsim.cpp,v 1.73 2001/02/09 22:22:04 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.71 2001/02/09 21:42:03 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.73 2001/02/09 22:22:04 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -189,10 +189,15 @@ CTSimApp::OnInit()
        wxString helpDir;
        if (! m_pConfig->Read("HelpDir", &helpDir))
                helpDir = ::wxGetCwd();
-       if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") ||
+       if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
                ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
                *m_pLog << "Cannot initialize the HTML Help system" << "\n";
-       
+       else {
+           if (::wxDirExists ("/tmp"))
+               m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
+           m_pFrame->getHtmlHelpController().UseConfig (m_pConfig);
+       }
+
        for (int i = optind + 1; i <= argc; i++) {
                wxString filename = argv [i - 1];
                m_docManager->CreateDocument (filename, wxDOC_SILENT);