osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: add some cleanup function calls missing when leaving application 

Change-Id: I8f22d321e84daa36d4a40856b61d0844d3489cc2
Reviewed-on: https://code.wireshark.org/review/15374
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2016-05-11 15:16:44 +02:00
parent de61fb1cfb
commit f3e120816c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wireshark-qt.cpp
View File

@ -422,7 +422,7 @@ int main(int argc, char *argv[])
{
MainWindow *main_w;
int opt;
int opt, ret_val;
gboolean arg_error = FALSE;
char **ws_argv = argv;
@ -1414,7 +1414,23 @@ int main(int argc, char *argv[])
profile_store_persconffiles(FALSE);
return wsApp->exec();
ret_val = wsApp->exec();
epan_cleanup();
AirPDcapDestroyContext(&airpdcap_ctx);
#ifdef _WIN32
/* Shutdown windows sockets */
WSACleanup();
/* For some unknown reason, the "atexit()" call in "create_console()"
doesn't arrange that "destroy_console()" be called when we exit,
so we call it here if a console was created. */
destroy_console();
#endif /* _WIN32 */
return ret_val;
}
/*