reinit current state after reset

aqt/groups.py

@@ -159,7 +159,7 @@ class Groups(QDialog):
             gids = []
         if gids != self.mw.deck.qconf['groups']:
             self.mw.deck.qconf['groups'] = gids
-            self.mw.deck.reset()
+            self.mw.reset()
         QDialog.accept(self)
 
     def _makeItems(self, grps):

aqt/main.py

@@ -129,6 +129,7 @@ class AnkiQt(QMainWindow):
         "Called for non-trivial edits. Rebuilds queue and updates UI."
         self.deck.reset()
         runHook("reset")
+        self.moveToState(self.state)
 
     def requireReset(self, modal=False):
         "Signal queue needs to be rebuilt when edits are finished or by user."
@@ -141,8 +142,8 @@ class AnkiQt(QMainWindow):
 
     def maybeReset(self):
         if self.state == "resetRequired":
+            self.state = self.returnState
             self.reset()
-            self.moveToState(self.returnState)
 
     def _resetRequiredState(self, oldState):
         self.returnState = oldState