Ticket #5286: mythtv-5286-use_IsNewDatabase_everywhere.patch

libs/libmythtv/dbcheck.cpp

@@ -614 +614 @@
         return true;
     }
 
-    if (dbver == "")
+    if (DBUtil::IsNewDatabase())
     {
         if (!InitializeDatabase())
             return false;

libs/libmyth/mythcontext.cpp

@@ -30 +30 @@
 #include "util-x11.h"
 #include "mythsocket.h"
 #include "themeinfo.h"
+#include "dbutil.h"
 
 #include "libmythui/mythmainwindow.h"
 #include "libmythupnp/mythxmlclient.h"
@@ -3546 +3547 @@
 
 
     // No current DBSchemaVer? Empty database, so upgrade to create tables
-    if (dbver.isEmpty() || dbver == "0")
+    if (DBUtil::IsNewDatabase())
     {
         VERBOSE(VB_GENERAL, "No current database version. Auto upgrading");
         return MYTH_SCHEMA_UPGRADE;