- (warn_on_startup) factorize code warning because there's a running

  program
- previous button: complain if a tool is currently starting

1 files changed, 19 insertions, 9 deletions

diff --git a/control-center b/control-center
index 64d4b0b7..25c983f5 100755
--- a/control-center
+++ b/control-center
@@ -285,7 +285,7 @@ my @tree =
 
 # main window :
 
-my ($timeout, %check_boxes, $exp_frame, $emb_socket);
+my ($timeout, %check_boxes, $exp_frame, $emb_socket, $page_id);
 
 my $window_global = gtkset_size_request(Gtk2::Window->new('toplevel'), $default_width, $default_heigth);
 $window_global->resize($h{WIDTH}, $h{HEIGTH});
@@ -528,7 +528,11 @@ gtkadd($window_global,
                            ),
                 0, my $buttons = gtkadd(gtkset_layout(Gtk2::HButtonBox->new, 'end'),
                                         gtksignal_connect(my $previous = Gtk2::Button->new(N("Previous")),
-                                                          clicked => sub { set_page(0) }),
+                                                          clicked => sub {
+                                                              $page_id = 0;
+                                                              warn_on_startup();
+                                                          },
+                                                         ),
                                        ),
                )
       );
@@ -605,13 +609,8 @@ foreach (@tree) {
                                    # FIXME: the following code is currently useless: 
                                    #        should we provide a way to kill buggy embedded programs ?
                                    return if $left_locked;
-                                   if ($pending_app) {
-                                       return if !splash_warning(N("The modifications done in the current module won't be saved."), 1);
-                                       kill_children();
-                                       child_just_exited();
-                                   }
-                                                                 
-                                   set_page($my_index+1);
+                                   $page_id = $my_index + 1;
+                                   warn_on_startup();
                                },
                               }
                              );
@@ -728,6 +727,17 @@ sub group_by3 {
     @l;
 }
 
+sub warn_on_startup {
+    if ($pending_app) {
+        return if !splash_warning(N("The modifications done in the current module won't be saved."), 1);
+        kill_children();
+        child_just_exited();
+    }
+    
+    set_page($page_id);
+}
+
+
 
 #-------------------------------------------------------------
 # socket/plug managment