From 90656ef63f530dcd851dc1f33f12e6b6b352fac4 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Wed, 20 Oct 2021 12:56:08 -0400
Subject: [PATCH] 2021-10-20 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed a regression in rdairplay(1) that caused the '-style' switch 	to be
 ignored.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog               |  3 +++
 rdairplay/rdairplay.cpp | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 033a5304..6d65adda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22524,3 +22524,6 @@
 	* Updated I18N data.
 2021-10-13 Fred Gleason <fredg@paravelsystems.com>
 	* Incremented the package version to 4.0.0beta3.
+2021-10-20 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression in rdairplay(1) that caused the '-style' switch
+	to be ignored.
diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp
index 54fd60ca..775c72d8 100644
--- a/rdairplay/rdairplay.cpp
+++ b/rdairplay/rdairplay.cpp
@@ -2230,7 +2230,16 @@ void MainWidget::SetActionMode(StartButton::Mode mode)
 
 int main(int argc,char *argv[])
 {
-  QApplication::setStyle(RD_GUI_STYLE);
+  bool user_style=false;
+  for(int i=0;i<argc;i++) {
+    if(QString(argv[i])=="-style") {
+      user_style=true;
+      break;
+    }
+  }
+  if(!user_style) {
+    QApplication::setStyle(RD_GUI_STYLE);
+  }
   QApplication a(argc,argv);
   
   //