#
#
# patch "cmd_automate.cc"
#  from [5e97d510878071cf512adf39171ac1342111fa40]
#    to [a674b97589137be5fae539f6e87e4e8582280bf0]
# 
# patch "network/automate_session.cc"
#  from [ef677d06324365607b14c1b992b04850697ef7eb]
#    to [2317b37d497e13c289792e0600eb5cf520d64e49]
#
============================================================
--- cmd_automate.cc	5e97d510878071cf512adf39171ac1342111fa40
+++ cmd_automate.cc	a674b97589137be5fae539f6e87e4e8582280bf0
@@ -330,15 +330,15 @@ CMD_AUTOMATE_NO_STDIO(stdio, "",
           // options are saved back to _MTN/options, this shouldn't be
           // any different here
           workspace::maybe_set_options(app.opts, app.lua);
-
-          // restore app.opts
-          app.opts = original_opts;
         }
       catch (recoverable_failure & f)
         {
           os.write_out_of_band('e', f.what());
           os.end_cmd(2);
         }
+
+      // restore app.opts
+      app.opts = original_opts;
     }
     global_sanity.set_out_of_band_handler();
 }
============================================================
--- network/automate_session.cc	ef677d06324365607b14c1b992b04850697ef7eb
+++ network/automate_session.cc	2317b37d497e13c289792e0600eb5cf520d64e49
@@ -262,15 +262,15 @@ bool automate_session::do_work(transacti
                 // options are saved back to _MTN/options, this shouldn't be
                 // any different here
                 workspace::maybe_set_options(app.opts, app.lua);
-
-                // restore app.opts
-                app.opts = original_opts;
               }
             catch (recoverable_failure & f)
               {
                 errcode = 2;
                 write_automate_packet_cmd('e', f.what());
               }
+
+            // restore app.opts
+            app.opts = original_opts;
           }
 
         if (!oss.str().empty())