bugfix: some IDA 7 users (AUTOIMPORT_COMPAT_IDA695=NO) could not save compositions

gaasedelen · gaasedelen · commit 58f1260f0c56 · 2017-12-01T11:11:51.000-05:00
diff --git a/plugin/lighthouse/composer/shell.py b/plugin/lighthouse/composer/shell.py
@@ -582,14 +582,14 @@ def _accept_composition(self):
         # composition name
         #
 
-        coverage_name = idaapi.askstr(
-            0,
-            str("COMP_%s" % self.text),
-            "Save composition as..."
+        ok, coverage_name = prompt_string(
+            "Composition Name:",
+            "Please enter a name for this composition",
+            "COMP_%s" % self.text
         )
 
         # the user did not enter a coverage name or hit cancel - abort the save
-        if not coverage_name:
+        if not (ok and coverage_name):
             return
 
         #

Original file line number	Diff line number	Diff line change
`@@ -582,14 +582,14 @@ def _accept_composition(self):`
`582`	`582`	`# composition name`
`583`	`583`	`#`
`584`	`584`
`585`		`- coverage_name = idaapi.askstr(`
`586`		`- 0,`
`587`		`- str("COMP_%s" % self.text),`
`588`		`- "Save composition as..."`
	`585`	`+ ok, coverage_name = prompt_string(`
	`586`	`+ "Composition Name:",`
	`587`	`+ "Please enter a name for this composition",`
	`588`	`+ "COMP_%s" % self.text`
`589`	`589`	`)`
`590`	`590`
`591`	`591`	`# the user did not enter a coverage name or hit cancel - abort the save`
`592`		`- if not coverage_name:`
	`592`	`+ if not (ok and coverage_name):`
`593`	`593`	`return`
`594`	`594`
`595`	`595`	`#`