From cd7ce13e2f90bf25cedfcec1a606948b7b9897df Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 18 Mar 2016 14:35:34 +0100
Subject: fix partitions not initially displayed (mga#17564)

---
 perl-install/NEWS                | 3 +++
 perl-install/diskdrake/hd_gtk.pm | 6 ++++--
 perl-install/install/NEWS        | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index bd9ad169b..04e0a450a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o fix partitions not initially displayed (mga#17564)
+
 Version 17.19 - 24 February 2016
 
 - detect nvme devices as block devices (mga#17743)
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 68295879d..47d47472a 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -114,10 +114,13 @@ sub main {
     $notebook_widget->signal_connect(realize => $update_all);
     $w->sync;
     $notebook_widget->set_current_page(0);
+    # there's always at least one child (at least a button for create a new part on empty discs):
+    my @children = $current_kind->{display_box} ? $current_kind->{display_box}->get_children : ();
     # workaround for $notebook_widget being realized too early:
-    if (!$done_button) {
+    if (!@children ||!$done_button) {
 	$notebook_widget->set_current_page(-1);
 	$notebook_widget->set_current_page(0);
+	undef $initializing;
 	$update_all->(2);
     }
     $done_button->grab_focus;
@@ -127,7 +130,6 @@ sub main {
         if $::isStandalone;
     }
 
-    undef $initializing;
     $w->main;
 }
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b19c25f89..e33d2375c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
 - prevent slow boot on first boot (mga#16684)
+- partionning:
+  o fix partitions not initially displayed (mga#17564)
 
 Version 17.19 - 24 February 2016
 
-- 
cgit v1.2.1