incorporated vim's link.sh; -i arg reports commit

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 7b31ae4f83283ccbf65a91fe32e9e999f65ea626..8554c7fb854dff128875dbaf78dea33df717fc19 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -40,8 +40,6 @@ Main::Main(Mf::Settings& settings, Mf::Video& video) :
        mNewContextDispatch = dispatch.addTarget("video.newcontext",
                                                                                         boost::bind(&Main::setupGL));
        setupGL();
-
-       addChild(TitleLayer::alloc());
 }
 
 
@@ -49,9 +47,10 @@ void Main::update(Mf::Scalar t, Mf::Scalar dt)
 {
        if (children().size() == 0)
        {
-               Mf::logWarning("main view has no children");
-               stop();
-               return;
+               //Mf::logWarning("main view has no children");
+               //stop();
+               //return;
+               addChild(TitleLayer::alloc());
        }
 
        Mf::View::update(t, dt);
@@ -128,7 +127,8 @@ std::string Main::getConfigPath()
        // 3. $HOME/.yoinkrc
        // 4. YOINKRC (environment)
 
-       std::string path = Mf::Resource::getPath("yoinkrc");
+       std::string path("yoinkrc");
+       Mf::Resource::getPath(path);
 
 #if !defined(_WIN32)
        path += ":/etc/yoinkrc";
@@ -221,11 +221,18 @@ void Main::printInfo(int argc, char* argv[])
        }
 
        std::cout << "   Executable: " << argv[0] << std::endl
+#ifdef YOINK_GITHEAD
+                         << "       Commit: "YOINK_GITHEAD << std::endl
+#endif
                          << "      Version: "VERSION << std::endl
                          << "        Built: " << COMPILE_TIME << std::endl
                          << "     Compiler: "COMPILER_STRING << std::endl
                          << "       Assets: " << assets << std::endl
                          << "Build options: "
+#ifndef HAVE_CLOCK_GETTIME
+                         << "-"
+#endif
+                         << "clock_gettime "
 #ifdef NDEBUG
                          << "-"
 #endif