Index: /issm/trunk-jpl/src/m/classes/settings.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.m	(revision 14214)
+++ /issm/trunk-jpl/src/m/classes/settings.m	(revision 14215)
@@ -65,5 +65,9 @@
 			WriteData(fid,'object',obj,'fieldname','results_as_patches','format','Boolean');
 			WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer');
-			WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean');
+			if obj.waitonlock>0,
+				WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',true,'format','Boolean');
+			else
+				WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',false,'format','Boolean');
+			end
 		end % }}}
 	end
Index: /issm/trunk-jpl/src/m/classes/settings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.py	(revision 14214)
+++ /issm/trunk-jpl/src/m/classes/settings.py	(revision 14215)
@@ -77,5 +77,8 @@
 		WriteData(fid,'object',self,'fieldname','results_as_patches','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','output_frequency','format','Integer')
-		WriteData(fid,'object',self,'fieldname','waitonlock','format','Boolean')
+		if self.waitonlock>0:
+			WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',True,'format','Boolean');
+		else:
+			WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',False,'format','Boolean');
 	# }}}