# HG changeset patch
# User John Donoghue
# Date 1427915774 14400
# Node ID b08c13ed4a8c96822cd6530df76e135f10f767aa
# Parent  f2dea119369e426769e531948ead4c2d3d02fabf
Qt PopupMenuControl: son creation se index to Value, and dont fire callback on programatic value set (Bug #44687)

* libgui/graphics/PopupMenuControl.cc
  (PopupMenuControl::PopupMenuControl): call update to ID_VALUE
  (PopupMenuControl::update): set m_blockUpdate whilst in update for ID_VALUE

diff -r f2dea119369e -r b08c13ed4a8c libgui/graphics/PopupMenuControl.cc
--- a/libgui/graphics/PopupMenuControl.cc	Wed Apr 01 15:16:12 2015 -0400
+++ b/libgui/graphics/PopupMenuControl.cc	Wed Apr 01 15:16:14 2015 -0400
@@ -56,6 +56,8 @@
 
   box->addItems (Utils::fromStdString (up.get_string_string ()).split ('|'));
 
+  update (uicontrol::properties::ID_VALUE);
+
   connect (box, SIGNAL (currentIndexChanged (int)),
            SLOT (currentIndexChanged (int)));
 }
@@ -97,6 +99,7 @@
       break;
 
     case uicontrol::properties::ID_VALUE:
+      m_blockUpdate = true;
         {
           Matrix value = up.get_value ().matrix_value ();
 
@@ -111,6 +114,7 @@
                 }
             }
         }
+      m_blockUpdate = false;
       break;
 
     default: