Merge branch 'release' of https://github.com/psychopy/psychopy into r…

…elease
peircej · Apr 26, 2023 · 384eb86 · 384eb86
2 parents 90b28e4 + edc1f22
commit 384eb86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/psychopy/app/_psychopyApp.py b/psychopy/app/_psychopyApp.py
@@ -1006,10 +1006,10 @@ def quit(self, event=None):
         for frame in self.getAllFrames():
             try:
                 frame.closeFrame(event=event, checkSave=False)
-                # must do this before destroying the frame?
-                self.prefs.saveAppData()
             except Exception:
                 pass  # we don't care if this fails - we're quitting anyway
+        # must do this before destroying the frame?
+        self.prefs.saveAppData()
         #self.Destroy()
 
         # Reset streams back to default

diff --git a/psychopy/experiment/components/polygon/__init__.py b/psychopy/experiment/components/polygon/__init__.py
@@ -270,10 +270,14 @@ def writeInitCodeJS(self, buff):
             code = ("{name} = new visual.ShapeStim ({{\n"
                     "  win: psychoJS.window, name: '{name}', {unitsStr}\n"
                     "  vertices: 'arrow', size:{size},\n")
-        else:
+        elif self.params['shape'] == 'regular polygon...':
             code = ("{name} = new visual.Polygon ({{\n"
                     "  win: psychoJS.window, name: '{name}', {unitsStr}\n"
                     "  edges: {nVertices}, size:{size},\n")
+        else:
+            code = ("{name} = visual.ShapeStim({{\n" +
+                    "  win: psychoJS.window, name: '{name}', {unitsStr}, \n"
+                    "  vertices={vertices}, size={size},\n")
 
         depth = -self.getPosInRoutine()
 
@@ -303,5 +307,6 @@ def writeInitCodeJS(self, buff):
                                             opacity=inits['opacity'],
                                             depth=depth,
                                             interpolate=interpolate,
-                                            nVertices=inits['nVertices']
+                                            nVertices=inits['nVertices'],
+                                            vertices=inits['vertices']
                                             ))