TempleOSCD_150216.ISO

Adam/TaskSettings.CPP

@@ -10,6 +10,7 @@ public CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0)
   if (!task) task=Fs;
   if (!TaskValidate(task)) return NULL;
   tempse=CAlloc(sizeof(CTaskSettings),task);
+  tempse->cur_dir=CurDir(task,task);
   tempse->draw_it=task->draw_it;
   GetVGAPalette4(tempse->palette4);
   tempse->task_end_cb=task->task_end_cb;
@@ -48,10 +49,10 @@ public CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0)
   tempse->border_src =task->border_src;
   tempse->border=!Bt(&task->display_flags,DISPLAYf_NO_BORDER);
   tempse->preempt=Bt(&task->task_flags,TASKf_PREEMPT);
-  if (TaskValidate(ws.task))
-    tempse->wordstat=TRUE;
+  if (TaskValidate(ac.task))
+    tempse->autocomplete=TRUE;
   else
-    tempse->wordstat=FALSE;
+    tempse->autocomplete=FALSE;
 
   tempse->next=task->next_settings;
   task->next_settings=tempse;
@@ -68,8 +69,8 @@ U0 SettingsPop2(CTask *task,CTaskSettings *tempse)
   }
 
   WinBorder(tempse->border,task);
-  SetWinHorz(tempse->left,tempse->right,task);
-  SetWinVert(tempse->top,tempse->bottom,task);
+  WinHorz(tempse->left,tempse->right,task);
+  WinVert(tempse->top,tempse->bottom,task);
   task->scroll_x=tempse->scroll_x;
   task->scroll_y=tempse->scroll_y;
   task->scroll_z=tempse->scroll_z;
@@ -79,7 +80,7 @@ U0 SettingsPop2(CTask *task,CTaskSettings *tempse)
   task->border_src =tempse->border_src;
   task->title_src  =tempse->title_src;
   StrCpy(task->task_title,tempse->task_title);
-  WordStat(tempse->wordstat);
+  AutoComplete(tempse->autocomplete);
   SetVGAPalette4(tempse->palette4);
   Snd(0);
 }
@@ -95,6 +96,8 @@ public U0 SettingsPop(CTask *task=NULL,I64 flags=0)
   }
   if (tempse=task->next_settings) {
     task->next_settings=tempse->next;
+    Cd(tempse->cur_dir);
+    Free(tempse->cur_dir);
     task->draw_it=tempse->draw_it;
     task->task_end_cb=tempse->task_end_cb;