#
#
# patch "work.cc"
#  from [d1c7f3d992b6e315c77d881e3a04a1b69b551f01]
#    to [aa9b143c8200a66da1372f863cf5f172a4e12a15]
#
============================================================
--- work.cc	d1c7f3d992b6e315c77d881e3a04a1b69b551f01
+++ work.cc	aa9b143c8200a66da1372f863cf5f172a4e12a15
@@ -642,11 +642,17 @@ workspace::set_options(options const & o
       system_path current_workspace;
       get_current_workspace(current_workspace);
 
-      database old_db(cur_opts, lua);
-      old_db.unregister_workspace(current_workspace);
+      if (cur_opts.dbname_type == managed_db)
+        {
+          database old_db(cur_opts, lua);
+          old_db.unregister_workspace(current_workspace);
+        }
 
-      database new_db(opts, lua);
-      new_db.register_workspace(current_workspace);
+      if (opts.dbname_type == managed_db)
+        {
+          database new_db(opts, lua);
+          new_db.register_workspace(current_workspace);
+        }
 
       cur_opts.dbname_type = opts.dbname_type;
       cur_opts.dbname_alias = opts.dbname_alias;