From 8897b47e701092a8e514e74708d226fd490fb89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Fri, 27 Mar 2015 09:47:56 +0200 Subject: [PATCH] UI|Client: Minor improvements Don't warn about known shared libs not being plugins. Don't allow negative time values in the "last updated since" string. --- doomsday/apps/client/src/dd_plugin.cpp | 8 ++++++++ doomsday/apps/client/src/updater/updatersettings.cpp | 1 + 2 files changed, 9 insertions(+) diff --git a/doomsday/apps/client/src/dd_plugin.cpp b/doomsday/apps/client/src/dd_plugin.cpp index 4e725b35ae..97993628f9 100644 --- a/doomsday/apps/client/src/dd_plugin.cpp +++ b/doomsday/apps/client/src/dd_plugin.cpp @@ -103,6 +103,14 @@ static int loadPlugin(void * /*libraryFile*/, char const *fileName, char const * ::Library *plugin = Library_New(pluginPath); if(!plugin) { +#ifdef UNIX + String const fn = Path(pluginPath).fileName(); + if(fn.contains("libfmodex") || fn.contains("libassimp")) + { + // No need to warn about these shared libs. + return 0; + } +#endif LOG_RES_WARNING("Failed to load \"%s\": %s") << pluginPath << Library_LastError(); return 0; // Continue iteration. } diff --git a/doomsday/apps/client/src/updater/updatersettings.cpp b/doomsday/apps/client/src/updater/updatersettings.cpp index 17b50edebb..25b90a93a5 100644 --- a/doomsday/apps/client/src/updater/updatersettings.cpp +++ b/doomsday/apps/client/src/updater/updatersettings.cpp @@ -171,6 +171,7 @@ de::String UpdaterSettings::lastCheckAgo() const if(!when.isValid()) return ""; // Never checked. de::TimeDelta delta = when.since(); + if(delta < 0.0) return ""; int t; if(delta < 60.0)