X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=6a426fb8f41c89cfba117571a945a554854fffb9;hp=85828c7f65dbfee150201d997ee6ffa0754e0b07;hb=c9e20ac06383b20ceb5404c9237e319c2e90d157;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 85828c7..6a426fb 100644
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -34,6 +34,7 @@
 #include <Moof/Dispatcher.hh>
 #include <Moof/Exception.hh>
 #include <Moof/Log.hh>
+#include <Moof/ModalDialog.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Resource.hh>
 #include <Moof/Transition.hh>
@@ -128,13 +129,8 @@ bool MainLayer::handleEvent(const Mf::Event& event)
 
 void MainLayer::quit()
 {
-#if NDEBUG
-	// we don't really need to unwind the stack and shut everything down because
-	// the operating system will take care of cleaning up
-	exit(0);
-#else
+	// remove all the layers
 	mEngine->clear();
-#endif
 }
 
 
@@ -219,7 +215,7 @@ void printInfo(int argc, char* argv[])
 
 	std::cout << "   Executable: " << argv[0] << std::endl
 			  << "      Version: "VERSION << std::endl
-#ifdef __DATE__
+#if defined(__DATE__) && defined(__TIME__)
 			  << "        Built: "__DATE__" "__TIME__ << std::endl
 #endif
 			  << "     Compiler: "COMPILER_STRING << std::endl
@@ -233,10 +229,18 @@ void printInfo(int argc, char* argv[])
 			  << "-"
 #endif
 			  << "double-precision "
+#ifndef USE_GTK
+			  << "-"
+#endif
+			  << "gtk "
 #ifndef PROFILING_ENABLED
 			  << "-"
 #endif
 			  << "profile "
+#ifndef USE_QT4
+			  << "-"
+#endif
+			  << "qt4 "
 #ifndef USE_THREADS
 			  << "-"
 #endif
@@ -251,9 +255,6 @@ void goodbye()
 }
 
 
-typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>,
-		cml::col_basis, cml::col_major >		Matrix5;
-
 int main(int argc, char* argv[])
 {
 	if (argc > 1)
@@ -304,7 +305,7 @@ int main(int argc, char* argv[])
 
 	Mf::Resource::addSearchPath(YOINK_DATADIR);
 
-	std::string iconFile = Mf::Resource::getPath("yoink.png");
+	std::string iconFile = Mf::Resource::getPath(PACKAGE".png");
 
 
 	// Build the list of config files to search for, in this order:
@@ -325,7 +326,6 @@ int main(int argc, char* argv[])
 		configFiles += configFile;
 	}
 
-
 	try
 	{
 		Mf::Engine app(argc, argv, PACKAGE_STRING, iconFile, configFiles);
@@ -333,11 +333,19 @@ int main(int argc, char* argv[])
 
 		app.run();
 	}
-	catch (Mf::Exception e)
+	catch (const Mf::Exception& e)
 	{
-		Mf::logError("unhandled exception: <<%s>>", e.what());
-		Mf::logInfo("it's time to crash now :-(");
-		throw e;
+		Mf::logError("unhandled exception (code %d): \"%s\"",
+				e.code(), e.what());
+
+		Mf::ModalDialog dialog;
+		dialog.title = PACKAGE_STRING;
+		dialog.text1 = "Unhandled Exception";
+		dialog.text2 = e.what();
+		dialog.type = Mf::ModalDialog::CRITICAL;
+		dialog.run();
+
+		return 1;
 	}
 
 	return 0;