From 6ee9578318d313ab4f89bf2656999229d9786c87 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 25 Feb 2021 13:35:35 -0500
Subject: [PATCH] 2021-02-25 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed regressions in rdcartslots(1) that caused widgets to fail 	to
 update properly after reloading slots.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog               | 3 +++
 lib/rdcartslot.cpp      | 8 ++++----
 lib/rdcueeditdialog.cpp | 9 +++------
 lib/rdlistsvcs.cpp      | 4 ++--
 lib/rdslotdialog.cpp    | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fac29015..6f168064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21220,3 +21220,6 @@
 2021-02-25 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression in rdimport(1) that caused it to fail to
 	start in dropbox mode.
+2021-02-25 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed regressions in rdcartslots(1) that caused widgets to fail
+	to update properly after reloading slots.
diff --git a/lib/rdcartslot.cpp b/lib/rdcartslot.cpp
index 3003e5ff..8303c6b8 100644
--- a/lib/rdcartslot.cpp
+++ b/lib/rdcartslot.cpp
@@ -413,7 +413,7 @@ void RDCartSlot::doubleClickedData()
     loadData();
   }
   else {
-    if(slot_cue_dialog->exec(slot_logline)==0) {
+    if(slot_cue_dialog->exec(slot_logline)) {
       slot_box->setBarMode(true);
       slot_box->setCart(slot_logline);
     }
@@ -431,7 +431,7 @@ void RDCartSlot::loadData()
     cartnum=slot_logline->cartNumber();
     if(cartnum==0) {
       if(slot_cart_dialog->exec(&cartnum,RDCart::All,QString(),
-				&slot_temp_cart)==0) {
+				&slot_temp_cart)) {
 	load(cartnum);
       }
     }
@@ -441,7 +441,7 @@ void RDCartSlot::loadData()
     break;
 
   case RDSlotOptions::BreakawayMode:
-    if(slot_svcs_dialog->exec(&slot_svcname)==0) {
+    if(slot_svcs_dialog->exec(&slot_svcname)) {
       slot_box->setService(slot_svcname);
       slot_box->setStatusLine(tr("Waiting for break..."));
     }
@@ -456,7 +456,7 @@ void RDCartSlot::loadData()
 void RDCartSlot::optionsData()
 {
   RDSlotOptions::Mode old_mode=slot_options->mode();
-  if(slot_slot_dialog->exec(slot_options)==0) {
+  if(slot_slot_dialog->exec(slot_options)) {
     if(old_mode!=slot_options->mode()) {
       slot_box->clear();
     }
diff --git a/lib/rdcueeditdialog.cpp b/lib/rdcueeditdialog.cpp
index 7724cd81..a8c292f5 100644
--- a/lib/rdcueeditdialog.cpp
+++ b/lib/rdcueeditdialog.cpp
@@ -2,7 +2,7 @@
 //
 // A Dialog Box for using an RDCueEdit widget.
 //
-//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Library General Public License 
@@ -18,9 +18,6 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-
 #include "rdcueeditdialog.h"
 
 RDCueEditDialog::RDCueEditDialog(RDCae *cae,int play_card,int play_port,
@@ -98,11 +95,11 @@ void RDCueEditDialog::okData()
 			      RDLogLine::LogPointer);
     edit_logline->setPlayPositionChanged(true);
   }
-  done(0);
+  done(true);
 }
 
 
 void RDCueEditDialog::cancelData()
 {
-  done(-1);
+  done(false);
 }
diff --git a/lib/rdlistsvcs.cpp b/lib/rdlistsvcs.cpp
index 59f4daea..b1f54ff7 100644
--- a/lib/rdlistsvcs.cpp
+++ b/lib/rdlistsvcs.cpp
@@ -107,13 +107,13 @@ void RDListSvcs::okData()
   }
   *edit_svcname=edit_svc_model->serviceName(rows.first());
 
-  done(0);
+  done(true);
 }
 
 
 void RDListSvcs::cancelData()
 {
-  done(-1);
+  done(false);
 }
 
 
diff --git a/lib/rdslotdialog.cpp b/lib/rdslotdialog.cpp
index 828e34eb..0d41b388 100644
--- a/lib/rdslotdialog.cpp
+++ b/lib/rdslotdialog.cpp
@@ -145,13 +145,13 @@ void RDSlotDialog::okData()
   edit_options->setHookMode(edit_hook_box->currentIndex());
   edit_options->setStopAction((RDSlotOptions::StopAction)edit_stop_action_box->
 			      currentIndex());
-  done(0);
+  done(true);
 }
 
 
 void RDSlotDialog::cancelData()
 {
-  done(-1);
+  done(false);
 }