ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices

This commit is contained in:
Isaac Connor 2021-08-05 14:31:33 -04:00
parent 45bf28a104
commit a3a592d5e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zmu.cpp
View File

@ -197,6 +197,7 @@ bool ValidateAccess(User *user, int mon_id, int function) {
void exit_zmu(int exit_code) { void exit_zmu(int exit_code) {
logTerm(); logTerm();
dbQueue.stop();
zmDbClose(); zmDbClose();
exit(exit_code); exit(exit_code);
@ -248,7 +249,7 @@ int main(int argc, char *argv[]) {
{nullptr, 0, nullptr, 0} {nullptr, 0, nullptr, 0}
}; };
const char *device = nullptr; std::string device;
int mon_id = 0; int mon_id = 0;
bool verbose = false; bool verbose = false;
int function = ZMU_BOGUS; int function = ZMU_BOGUS;
@ -404,7 +405,7 @@ int main(int argc, char *argv[]) {
Usage(); Usage();
} }
if ( device && !(function&ZMU_QUERY) ) { if ( !device.empty() && !(function&ZMU_QUERY) ) {
fprintf(stderr, "Error, -d option cannot be used with this option\n"); fprintf(stderr, "Error, -d option cannot be used with this option\n");
Usage(); Usage();
} }