mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2663_background_segfault'

Browse Source 
* 2663_background_segfault:
  Ticket #2663: Segmentation fault while background copying
This commit is contained in:
Slava Zanko 2012-04-04 13:59:39 +03:00
commit 42f2b04eee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.c
View File

@ -319,7 +319,7 @@ do_load_prompt (void)
return ret;
/* Don't actually change the prompt if it's invisible */
if (((Dlg_head *) top_dlg->data == midnight_dlg) && command_prompt)
if (top_dlg != NULL && ((Dlg_head *) top_dlg->data == midnight_dlg) && command_prompt)
{
setup_cmdline ();
@ -426,11 +426,11 @@ main (int argc, char *argv[])
if (!mc_args_parse (&argc, &argv, "mc", &error))
{
startup_exit_falure:
startup_exit_falure:
fprintf (stderr, _("Failed to run:\n%s\n"), error->message);
g_error_free (error);
g_free (shell);
startup_exit_ok:
startup_exit_ok:
str_uninit_strings ();
return exit_code;
}
@ -564,7 +564,7 @@ main (int argc, char *argv[])
if (mc_global.midnight_shutdown)
exit_code = EXIT_SUCCESS;
else
exit_code = do_nc () ? EXIT_SUCCESS : EXIT_FAILURE;
exit_code = do_nc ()? EXIT_SUCCESS : EXIT_FAILURE;
/* Save the tree store */
(void) tree_store_save ();