X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2Fvirt_top_main.ml;h=44dbf9356b895c181ff8c3475d0340db5a930a8e;hp=edf87de3b540a868b08a7fbd4bd85e31820f2e63;hb=32a6888f045f64a3fb3423e21897977f9a839bf9;hpb=9bb5f67c0d8a6e8dad7de72e2488ee73c90f7d43

diff --git a/virt-top/virt_top_main.ml b/virt-top/virt_top_main.ml
index edf87de..44dbf93 100644
--- a/virt-top/virt_top_main.ml
+++ b/virt-top/virt_top_main.ml
@@ -1,5 +1,5 @@
 (* 'top'-like tool for libvirt domains.
-   (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc.
+   (C) Copyright 2007-2009 Richard W.M. Jones, Red Hat Inc.
    http://libvirt.org/
 
    This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 open Curses
 
+open Virt_top_gettext.Gettext
 open Virt_top
 
 (* Note: make sure we catch any exceptions and clean up the display.
@@ -30,20 +31,23 @@ open Virt_top
  * the program under --debug ...).
  *)
 let error =
-  let setup = start_up () in
+  let ((_, _, script_mode, stream_mode, _, _, _, _) as setup) = start_up () in
 
   try
+    Printexc.record_backtrace true;
     main_loop setup;
-    endwin ();
+    if not script_mode && not stream_mode then endwin ();
     false
   with
   | Libvirt.Virterror err ->
-      endwin ();
+      if not script_mode && not stream_mode then endwin ();
       prerr_endline (Libvirt.Virterror.to_string err);
+      Printexc.print_backtrace stderr;
       true
   | exn ->
-      endwin ();
-      prerr_endline ("Error: " ^ Printexc.to_string exn);
+      if not script_mode && not stream_mode then endwin ();
+      prerr_endline (s_ "Error" ^ ": " ^ Printexc.to_string exn);
+      Printexc.print_backtrace stderr;
       true
 
 let () =