diff --git a/src/zm_db.cpp b/src/zm_db.cpp index 3ab89386d..d4a927f3b 100644 --- a/src/zm_db.cpp +++ b/src/zm_db.cpp @@ -31,10 +31,10 @@ bool zmDbConnected = false; bool zmDbConnect() { // For some reason having these lines causes memory corruption and crashing on newer debian/ubuntu // But they really need to be here in order to prevent a double open of mysql - //if ( zmDbConnected ) { - //Warning("Calling zmDbConnect when already connected"); - //return true; - //} + if ( zmDbConnected ) { + Warning("Calling zmDbConnect when already connected"); + return true; + } if ( !mysql_init(&dbconn) ) { Error("Can't initialise database connection: %s", mysql_error(&dbconn)); diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp index b4d7e323a..4d78c45ab 100644 --- a/src/zm_ffmpeg.cpp +++ b/src/zm_ffmpeg.cpp @@ -27,9 +27,9 @@ void FFMPEGInit() { static bool bInit = false; if ( !bInit ) { - if ( logDebugging() ) - av_log_set_level( AV_LOG_DEBUG ); - else + //if ( logDebugging() ) + //av_log_set_level( AV_LOG_DEBUG ); + //else av_log_set_level( AV_LOG_QUIET ); av_register_all(); avformat_network_init(); diff --git a/web/api/app/Plugin/CakePHP-Enum-Behavior b/web/api/app/Plugin/CakePHP-Enum-Behavior index ea90c0cd7..ca91b87fd 160000 --- a/web/api/app/Plugin/CakePHP-Enum-Behavior +++ b/web/api/app/Plugin/CakePHP-Enum-Behavior @@ -1 +1 @@ -Subproject commit ea90c0cd7f6e24333a90885e563b5d30b793db29 +Subproject commit ca91b87fda8e006e4fca2ed870f24f9a29c2905d diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud index 0bd63fb46..1351dde6b 160000 --- a/web/api/app/Plugin/Crud +++ b/web/api/app/Plugin/Crud @@ -1 +1 @@ -Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef +Subproject commit 1351dde6b4c75b215099ae8bcf5a21d6c6e10298