From bd5c568f8fe72ab877d6695c5fd41466731400ea Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Fri, 23 Mar 2012 12:49:46 +0300 Subject: [PATCH] Ticket #2663: Segmentation fault while background copying Action to reproduce bug: Start copy/move file/files (around 100mb+) in background Signed-off-by: Slava Zanko --- src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index b18c8c267..8fecc39ed 100644 --- a/src/main.c +++ b/src/main.c @@ -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 ();