r20231 by jghali - #13193, second part: fix script related to mouse up action being lost when annotation dialog is closed while current script displayed is related to another action

[scribus-commit]

Author: jghali
Date: Fri Jul  3 22:22:22 2015
New Revision: 20231

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20231
Log:
#13193, second part: fix script related to mouse up action being lost when annotation dialog is closed while current script displayed is related to another action

Modified:
    trunk/Scribus/scribus/ui/annot.cpp

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20231&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Fri Jul  3 22:22:22 2015
@@ -2050,11 +2050,11 @@
 				break;
 		}
 	}
-	annotation.setAction("");
 	switch (ActionCombo->currentIndex())
 	{
 		case 0:
 			annotation.setActionType(Annotation::Action_None);
+			annotation.setAction(QString());
 			break;
 		case 1:
 			annotation.setActionType(Annotation::Action_JavaScript);
@@ -2116,6 +2116,9 @@
 			annotation.setActionType(Annotation::Action_Named);
 			annotation.setAction(nameActionCombo->itemData(nameActionCombo->currentIndex()).toString());
 			break;
+		default:
+			annotation.setAction(QString());
+			break;
 	}
 	if (!annotation.E_act().isEmpty())
 		AAct = true;