X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=bfb702cf064ce062462b67e5c7f0d0eba3f822d0;hp=a92b0aea8058f966a33ad68726c8a2474e61e758;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index a92b0aea..bfb702cf 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "deviceoptions.hpp"
@@ -25,7 +24,7 @@
 
 #include <pv/prop/property.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::shared_ptr;
 
@@ -45,10 +44,19 @@ DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
 	layout_.addWidget(binding_.get_property_form(this, true));
 }
 
-pv::prop::binding::DeviceOptions& DeviceOptions::binding()
+pv::binding::Device& DeviceOptions::binding()
 {
 	return binding_;
 }
 
+void DeviceOptions::show()
+{
+	// Update device config widgets with the current values supplied by the
+	// driver before actually showing the popup dialog
+	binding_.update_property_widgets();
+
+	Popup::show();
+}
+
 } // namespace popups
 } // namespace pv