diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
index a31e22a..98f8cac 100644
a
|
b
|
bool MythCoreContext::SetupCommandSocket(MythSocket *serverSock, |
297 | 297 | proto_mismatch = false; |
298 | 298 | |
299 | 299 | #ifndef IGNORE_PROTO_VER_MISMATCH |
300 | | if (!CheckProtoVersion(serverSock, timeout_in_ms, true)) |
| 300 | if (!GetNumSetting("IgnoreProtoVerMismatch", false) |
| 301 | && !CheckProtoVersion(serverSock, timeout_in_ms, true)) |
301 | 302 | { |
302 | 303 | proto_mismatch = true; |
303 | 304 | return false; |
diff --git a/mythtv/libs/libmythbase/remotefile.cpp b/mythtv/libs/libmythbase/remotefile.cpp
index 5d6d086..8003676 100644
a
|
b
|
MythSocket *RemoteFile::openSocket(bool control) |
167 | 167 | QStringList strlist; |
168 | 168 | |
169 | 169 | #ifndef IGNORE_PROTO_VER_MISMATCH |
170 | | if (!gCoreContext->CheckProtoVersion(lsock, 5000)) |
| 170 | if (!gCoreContext->GetNumSetting("IgnoreProtoVerMismatch", false) |
| 171 | && !gCoreContext->CheckProtoVersion(lsock, 5000)) |
171 | 172 | { |
172 | 173 | LOG(VB_GENERAL, LOG_ERR, loc + |
173 | 174 | QString("Failed validation to server %1:%2").arg(host).arg(port)); |
diff --git a/mythtv/libs/libmythprotoserver/requesthandler/outboundhandler.cpp b/mythtv/libs/libmythprotoserver/requesthandler/outboundhandler.cpp
index 392437b..c9eb966 100644
a
|
b
|
bool OutboundRequestHandler::DoConnectToMaster(void) |
46 | 46 | } |
47 | 47 | |
48 | 48 | #ifndef IGNORE_PROTO_VER_MISMATCH |
49 | | if (!m_socket->Validate()) |
| 49 | if (!gCoreContext->GetNumSetting("IgnoreProtoVerMismatch", false) |
| 50 | && !m_socket->Validate()) |
50 | 51 | { |
51 | 52 | LOG(VB_GENERAL, LOG_NOTICE, "Unable to confirm protocol version with backend."); |
52 | 53 | m_socket->DecrRef(); |
diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
index 29c17d5..2784b30 100644
a
|
b
|
int main(int argc, char **argv) |
2008 | 2008 | return GENERIC_EXIT_NO_THEME; |
2009 | 2009 | } |
2010 | 2010 | |
2011 | | if (!UpgradeTVDatabaseSchema(false)) |
| 2011 | if (!gCoreContext->GetNumSetting("IgnoreSchemaVerMismatch", false) |
| 2012 | && !UpgradeTVDatabaseSchema(false)) |
2012 | 2013 | { |
2013 | 2014 | LOG(VB_GENERAL, LOG_ERR, |
2014 | 2015 | "Couldn't upgrade database to new schema, exiting."); |