From a062efeb21d9caacd3b1627e4018e485ec67b93a Mon Sep 17 00:00:00 2001
From: Max Paperno <max@wdg.us>
Date: Wed, 12 Apr 2017 05:39:28 -0400
Subject: [PATCH] [Companion] Fix some Special/Global Functions editor source
 selection lists being broken and Action selector disappearing for simple
 actions with no parameters (fixes #4775 and #4779).

---
 companion/src/modeledit/customfunctions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index 559b5a245..26e618ac9 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -563,7 +563,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
 
     }
 
-    fswtchFunc[i]->setVisible(widgetsMask);
+    fswtchFunc[i]->setVisible(cfn.swtch.toValue());
     fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
     fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM);
     fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
@@ -701,7 +701,7 @@ void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
 void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode)
 {
   QStringList qs;
-  b->clear();
+  b->setModel(new QStandardItemModel(b));  // clear combo box but not any shared item model
   if (function==FuncPlaySound) {
     CustomFunctionData::populatePlaySoundParams(qs);
     b->addItems(qs);