Changeset 5020


Ignore:
Timestamp:
May 9, 2022, 4:09:44 PM (3 years ago)
Author:
Andreas Schnellbacher
Message:
  • Added 9 fixes for save and restore file lists, including virtual files, for check for .modify and for restart.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/netlabs/macros/filelist.e

    r5015 r5020  
    8787
    8888   fRestart  = (GetCheckModifyRestart() = 1)
    89    --dprintf( 'SaveAllLastRings: GetCheckModifyRestart() = 'Restart', fRestart = 'fRestart)
     89   --dprintf( 'SaveAllLastRings: GetCheckModifyRestart() = 'GetCheckModifyRestart()', fRestart = 'fRestart)
    9090
    9191   -- Check if this is an extra instance, e.g. opened by "svn ci".
    … …  
    237237
    238238   do once = 1 to 1
    239       rc = 0
     239      CheckRc = 0
     240      rc      = 0
     241      getfileid startfid
    240242      --dprintf( '   SaveNextLastRing 'arg( 1)': savelastringdisabled = 'savelastringdisabled)
    241243      if savelastringdisabled then
    … …  
    249251      KeyPath = '\NEPMD\Var\History\Last'
    250252
    251       CurVal = QueryConfigKey( KeyPath'\'Num)
    252       --dprintf( '   SaveNextLastRing 'Num': QueryConfigKey( 'KeyPath'\'Num') = 'CurVal)
    253       if CurVal = '*' | CurVal = '' then
    254          getfileid startfid
    255          'VSyncCursor'
    256 
    257          -- Reset universal
    258          ringnum = ''
    259 
    260          -- Write <filename> 'RestorePos <pos>', loop through all files in ring
    261          n = 0
    262          RestartDir = GetTmpPath()'nepmd\restart'
    263          RestartNumDir = RestartDir'\'Num
    264          -- Restart: The window with Num = 1 is not closed by
    265          -- 'SaveCloseNextLastRing'. 'SaveNextLastRing' is executed instead
    266          -- and that window (the last one) is closed specially. During Restart
    267          -- GetCheckModifyRestart is set to 1, so this is used here.
    268          fRestart = (upcase( Cmd) = 'CLOSE' | GetCheckModifyRestart() = 1)
    269          --dprintf( 'fRestart = 'fRestart)
    270          display -1
    271          dprintf( 'RINGCMD', 'SaveLastRing')
    272          do f = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
    273             -- Store virtual and modified states before save
    274             fVirtual  = IsVirtual()
    275             fModified = (.modify > 0)
    276 
    277             if fVirtual then
    278                SaveFilename = RestartNumDir'\'.filename
    279                if fRestart then
    280                   --dprintf( 'SaveNextLastRing: Save as 'SaveFilename', .filename = '.filename)
    281                   if not NepmdDirExists( RestartNumDir) then
    282                      MakeTree( RestartNumDir)
    283                   endif
    284                   .filename = SaveFilename
    285                   'xcom s /o /nt /ne'
    286                endif
    287             else
    288                if fModified & fRestart then
    289                   rcx = CheckModify()
    290                   if rcx then
    291                      rc = rcx
    292                      stop
    293                   endif
    294                endif
    295                SaveFilename = .filename
    296             endif
    297 
    298             --dprintf( 'SaveNextLastRing: Store in Last as 'SaveFilename)
    299             n = n + 1
    300             pSave_Pos( SavedPos)
    301             SavedPos = subword( SavedPos, 1, 4)  -- Omit the last two sizes
    302             -- Save filename and pos
    303             ConfigValue = EnquoteFileSpec( SaveFilename)
    304             if fVirtual & fModified then
    305                --dprintf( 'SaveNextLastRing: Virtual file: 'SaveFilename)
    306                ConfigValue = ConfigValue" 'mc ;RestorePos "SavedPos";RestoreModify 1'"
    307             else
    308                ConfigValue = ConfigValue" 'RestorePos "SavedPos"'"
    309             endif
    310             WriteConfigKey( KeyPath'\'Num'\'n, ConfigValue)
    311 
    312             nextfile
    313             getfileid fid
    314             if fid = startfid then
     253
     254      'VSyncCursor'
     255
     256      -- Reset universal
     257      ringnum = ''
     258
     259      -- Write <filename> 'RestorePos <pos>', loop through all files in ring
     260      n = 0
     261      RestartDir = GetTmpPath()'nepmd\restart'
     262      RestartNumDir = RestartDir'\'Num
     263      -- Restart: The window with Num = 1 is not closed by
     264      -- 'SaveCloseNextLastRing'. 'SaveNextLastRing' is executed instead
     265      -- and that window (the last one) is closed specially. During Restart
     266      -- GetCheckModifyRestart is set to 1, so this is used here.
     267      fRestart = (upcase( Cmd) = 'CLOSE' | GetCheckModifyRestart() = 1)
     268      --dprintf( 'SaveNextLastRing: fRestart = 'fRestart)
     269      display -1
     270      dprintf( 'RINGCMD', 'SaveLastRing')
     271      do f = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
     272         -- Store virtual and modified states before save
     273         fVirtual  = IsVirtual()
     274         VirtualFilename = ''
     275         fModified = (.modify > 0)
     276         n = n + 1
     277
     278         if fVirtual & fRestart then
     279            VirtualFilename = .filename
     280            WriteConfigKey( KeyPath'\'Num'\'n'\Filename', VirtualFilename)
     281            SaveFilename = RestartNumDir'\restart.'n
     282            --dprintf( 'SaveNextLastRing: Save as 'SaveFilename', .filename = '.filename)
     283            if not NepmdDirExists( RestartNumDir) then
     284               MakeTree( RestartNumDir)
     285            endif
     286            .filename = SaveFilename
     287            'xcom s /o /nt /ne'
     288
     289         elseif fModified & fRestart then
     290            CheckRc = CheckModify()
     291            if CheckRc then
     292               rc = CheckRc
    315293               leave
    316294            endif
    317          enddo
    318 
    319          -- Save window pos and size
    320          WindowPos = NepmdQueryWindowPos( EPMINFO_EDITFRAME)
    321          WriteConfigKey( KeyPath'\'Num'\WindowPos', WindowPos)
    322 
    323          -- Save WorkDir for first ring only, because it's global
    324          if Num = 1 then
    325             WriteConfigKey( KeyPath'\'Num'\WorkDir', directory())
    326          endif
    327 
    328          -- Frame window handle doesn't need to be saved
    329 
    330          -- Save client window handle
    331          hwndClient = getpminfo( EPMINFO_EDITCLIENT)
    332          WriteConfigKey( KeyPath'\'Num'\hwnd', hwndClient)
    333          --dprintf( '   SaveNextLastRing 'Num': WriteConfigKey( 'KeyPath'\'Num'\hwnd, 'hwndClient')')
    334 
    335          pActivateFile( startfid)
    336          display 1
    337 
    338          -- Save universal ringnum
    339          ringnum = Num
    340          --dprintf( '   SaveNextLastRing 'Num': ringnum = 'ringnum', hwndClient = 'hwndClient', 'n' filenames saved')
    341       endif
     295            SaveFilename = .filename
     296
     297         else
     298            SaveFilename = .filename
     299         endif
     300
     301         --dprintf( 'SaveNextLastRing: Store in Last as 'SaveFilename)
     302         pSave_Pos( SavedPos)
     303         SavedPos = subword( SavedPos, 1, 4)  -- Omit the last two sizes
     304         -- Save filename and pos
     305         ConfigValue = EnquoteFileSpec( SaveFilename)
     306         if fVirtual & fRestart & fModified then
     307            --dprintf( 'SaveNextLastRing: Virtual file: 'SaveFilename)
     308            ConfigValue = ConfigValue" 'mc ;RestorePos "SavedPos";RestoreFilename "VirtualFilename";RestoreModify 1'"
     309         elseif fVirtual & fRestart then
     310            --dprintf( 'SaveNextLastRing: Virtual file: 'SaveFilename)
     311            ConfigValue = ConfigValue" 'mc ;RestorePos "SavedPos";RestoreFilename "VirtualFilename"'"
     312         else
     313            ConfigValue = ConfigValue" 'RestorePos "SavedPos"'"
     314         endif
     315         WriteConfigKey( KeyPath'\'Num'\'n, ConfigValue)
     316
     317         nextfile
     318         getfileid fid
     319         if fid = startfid then
     320            leave
     321         endif
     322      enddo
     323      pActivateFile( startfid)
     324      display 1
     325      if CheckRc then
     326         leave
     327      endif
     328
     329      -- Save window pos and size
     330      WindowPos = NepmdQueryWindowPos( EPMINFO_EDITFRAME)
     331      WriteConfigKey( KeyPath'\'Num'\WindowPos', WindowPos)
     332
     333      -- Save WorkDir for first ring only, because it's global
     334      if Num = 1 then
     335         WriteConfigKey( KeyPath'\'Num'\WorkDir', directory())
     336      endif
     337
     338      -- Frame window handle doesn't need to be saved
     339
     340      -- Save client window handle
     341      hwndClient = getpminfo( EPMINFO_EDITCLIENT)
     342      WriteConfigKey( KeyPath'\'Num'\hwnd', hwndClient)
     343      --dprintf( '   SaveNextLastRing 'Num': WriteConfigKey( 'KeyPath'\'Num'\hwnd, 'hwndClient')')
     344
     345      -- Save universal ringnum
     346      ringnum = Num
     347      --dprintf( '   SaveNextLastRing 'Num': ringnum = 'ringnum', hwndClient = 'hwndClient', 'n' filenames saved')
    342348
    343349      if Cmd then
    … …  
    353359   universal excludehwndlist
    354360
    355    DoneRc  = 0
     361   --dprintf( 'CheckAllRingsModify: --------------------------------------------------------------------')
    356362   CheckRc = 0
    357    --dprintf( 'CheckAllRingsModify: --------------------------------------------------------------------')
    358363
    359364   -- Check if this is an extra instance, e.g. opened by "svn ci".
    … …  
    361366   -- here. If this window from an extra instance executes a PostTo
    362367   -- cmd to another EPM window, all other windows would close.
    363    if (IsExtraInstance() <> 0) then
     368   if (IsExtraInstance() <> 0) then  -- Returns 0 | 1 | '?'
    364369      return
    365370   endif
    … …  
    367372   -- Check current ring
    368373   'RingCheckModify'
    369    --dprintf( 'CheckAllRingsModify: RingCheckModify returns rc = 'rc', file on top = '.filename)
    370    if rc then
     374   CheckRc = rc
     375   --dprintf( 'CheckAllRingsModify: RingCheckModify returns CheckRc = 'CheckRc', file on top = '.filename)
     376   if CheckRc then
    371377      --dprintf( 'CheckAllRingsModify: RingCheckModify: File in this ring modified, file on top = '.filename)
    372       return rc
     378      return CheckRc
    373379   endif
    374380
    … …  
    440446
    441447      -- Same class as me?
    442       if ClsName = ClsClient then
    443          --dprintf( 'ClsName = 'ClsName)
    444          --dprintf( rightstr( cnt, 2)': 2) hwnd = F: 'ClsFrame', C: 'ClsClient', hwndF = 'hwnd', hwndC = 'hwndClient)
    445 
    446          -- The config value must be deleted first.
    447          -- In the first loop, it is checked if the passed cmd by PostTo is known.
    448          -- If known, the value '*' is written. If not, the short timeout of 1 s
    449          -- applies, rc is set and this proc returns.
    450          -- If the value '*' was written, the second loop is started with a larger
    451          -- timeout value. This is the real check.
    452          -- The advantage of the additional first loop is that a shorter timeout
    453          -- value can be used here. Previously, it was waited for the timeout of
    454          -- 60 s when the 'Quick Reference' window received the
    455          -- RingCheckModifyConfigKey cmd.
    456 
    457          -- Delete a global temp. config key first
    458          KeyPath = '\NEPMD\Var\RingCheckModify\Done'
    459          DeleteConfigKey( KeyPath)
    460 
    461          -- Don't process windows startet with /m (extra instance).
    462          -- Sending PostTo messages would make windows crash.
    463          if (IsExtraInstance( hwndClient) <> 0) then
    464             if excludehwndlist = '' then
    465                excludehwndlist = hwndClient
    466             else
    467                excludehwndlist = excludehwndlist hwndClient
    468             endif
    469          endif
    470          -- Don't process already excluded windows
    471          if wordpos( hwndClient, excludehwndlist) then
    472             iterate
    473          endif
    474 
    475          -- WaitNextCheckModify writes first the value '*' with a shorter
    476          -- timeout of 1 s to show that the cmd is understood.
    477          TimeoutMs = 60000  -- 60 s
    478          --dprintf( 'CheckAllRingsModify: call WaitNextCheckModify( 'hwndClient', 'KeyPath', 'TimeoutMs')')
    479          call WaitNextCheckModify( hwndClient, KeyPath, TimeoutMs)
    480          CheckRc = rc
    481          RingDone = QueryConfigKey( KeyPath)
    482          --dprintf( 'CheckAllRingsModify: RingDone = 'RingDone', CheckRc = 'CheckRc)
    483          -- Cleanup
    484          DeleteConfigKey( KeyPath)
    485 
    486          if CheckRc then
    487             --dprintf( 'Timeout on waiting for config key 'KeyPath' in CheckAllRingsModify')
    488             'SayError Timeout on waiting for config key 'KeyPath' in CheckAllRingsModify'
    489             if not wordpos( hwndClient, excludehwndlist) then
    490                if excludehwndlist = '' then
    491                   excludehwndlist = hwndClient
    492                else
    493                   excludehwndlist = excludehwndlist hwndClient
    494                endif
    495             endif
    496             DoneRc = (RingDone <> 1)
    497             --if RingDone = 1 then
    498             --   dprintf( 'CheckAllRingsModify: Included file modified, hwndClient = 'hwndClient', RingDone = 'RingDone)
    499             --else
    500             --   dprintf( 'CheckAllRingsModify: Ring not checked, hwndClient = 'hwndClient', RingDone = 'RingDone)
    501             --endif
    502             leave
     448      if ClsName <> ClsClient then
     449         iterate
     450      endif
     451
     452      --dprintf( 'ClsName = 'ClsName)
     453      --dprintf( rightstr( cnt, 2)': 2) hwnd = F: 'ClsFrame', C: 'ClsClient', hwndF = 'hwnd', hwndC = 'hwndClient)
     454
     455      -- The config value must be deleted first.
     456      -- In the first loop, it is checked if the passed cmd by PostTo is known.
     457      -- If known, the value '*' is written. If not, the short timeout of 1 s
     458      -- applies, rc is set and this proc returns.
     459      -- If the value '*' was written, the second loop is started with a larger
     460      -- timeout value. This is the real check.
     461      -- The advantage of the additional first loop is that a shorter timeout
     462      -- value can be used here. Previously, it was waited for the timeout of
     463      -- 60 s when the 'Quick Reference' window received the
     464      -- RingCheckModifyConfigKey cmd.
     465
     466      -- Delete a global temp. config key first
     467      KeyPath = '\NEPMD\Var\RingCheckModify\DoneRc'
     468      DeleteConfigKey( KeyPath)
     469
     470      -- Don't process windows startet with /m (extra instance).
     471      -- Sending PostTo messages would make windows crash.
     472      -- IsExtraInstance returns '?' if an EPM window is started without
     473      -- writing the LoaderArgs config key.
     474      if (IsExtraInstance( hwndClient) <> 0) then  -- Returns 0 | 1 | '?'
     475         --dprintf( 'CheckAllRingsModify: Adding hwndClient = 'hwndClient' to excludehwndlist = 'excludehwndlist)
     476         if excludehwndlist = '' then
     477            excludehwndlist = hwndClient
    503478         else
    504             --dprintf( 'CheckAllRingsModify: Included file not modified, hwndClient = 'hwndClient', RingDone = 'RingDone', CheckRc = 'CheckRc)
    505          endif
     479            excludehwndlist = excludehwndlist hwndClient
     480         endif
     481      endif
     482      -- Don't process already excluded windows
     483      if wordpos( hwndClient, excludehwndlist) then
     484         rc = -5
     485         --dprintf( 'CheckAllRingsModify: hwndClient = 'hwndClient', excludehwndlist = 'excludehwndlist', rc = 'rc)
     486         iterate
     487      endif
     488
     489      -- WaitNextCheckModify does 2 checks to shorten the timeout if
     490      -- RingCheckModifyConfigKey is unknown. The first check writes the value
     491      -- '*' with a shorter timeout of 1 s to show that the cmd is understood.
     492      -- The second check uses the following timeout value:
     493      TimeoutMs = 60000  -- 60 s
     494      --dprintf( 'CheckAllRingsModify: call WaitNextCheckModify( 'hwndClient', 'KeyPath', 'TimeoutMs')')
     495      call WaitNextCheckModify( hwndClient, KeyPath, TimeoutMs)
     496      CheckRc = rc
     497      --dprintf( 'CheckAllRingsModify: CheckRc = 'CheckRc)
     498
     499      if CheckRc = -22 then
     500         --dprintf( 'Timeout on waiting for config key 'KeyPath' in CheckAllRingsModify')
     501         'SayError Timeout on waiting for config key 'KeyPath' in CheckAllRingsModify'
     502         --dprintf( 'CheckAllRingsModify: Ring not checked, hwndClient = 'hwndClient', CheckRc = 'CheckRc)
     503         leave
     504      elseif CheckRc = -293 then
     505         --dprintf( 'CheckAllRingsModify: Cancel, hwndClient = 'hwndClient', CheckRc = 'CheckRc)
     506         leave
     507      elseif CheckRc = 0 then
     508          --dprintf( 'CheckAllRingsModify: Included file not modified, hwndClient = 'hwndClient', CheckRc = 'CheckRc)
     509      else
     510          -- This should not happen
     511          --dprintf( 'CheckAllRingsModify: other CheckRc, hwndClient = 'hwndClient', CheckRc = 'CheckRc)
    506512      endif
    507513   enddo
     514
     515   -- Cleanup
     516   DeleteConfigKey( KeyPath)
     517
    508518   call dynalink32( 'PMWIN',
    509519                    '#737',  -- WinEndEnumWindows
    510520                    henum, 2)
    511    --if not DoneRc then
    512    --   dprintf( 'No included file modified, DoneRc = 'DoneRc', CheckRc = 'CheckRc)
    513    --endif
    514    rc = DoneRc
    515 
    516 ; ---------------------------------------------------------------------------
     521   rc = CheckRc
     522
     523; ---------------------------------------------------------------------------
     524; This is executed by a child EPM window.
    517525; This works almost as RingCheckModify, except that a config key with the
    518526; rc from the checks is written. Config keys are global and can be used
    519527; across EPM windows.
     528; WaitNextCheckModify does 2 checks to shorten the timeout if
     529; RingCheckModifyConfigKey is unknown. The first check writes the value '*'
     530; with a shorter timeout of 1 s to show that the cmd is understood.
    520531defc RingCheckModifyConfigKey
    521532   KeyPath = strip( arg( 1))
    522    rc = 0
     533   CheckRc = 0
    523534   CurVal = QueryConfigKey( KeyPath)
    524535   --dprintf( '   RingCheckModifyConfigKey: QueryConfigKey( 'KeyPath') = 'CurVal', hwndClient = 'getpminfo( EPMINFO_EDITCLIENT))
    … …  
    528539      --dprintf( '   RingCheckModifyConfigKey: WriteConfigKey( 'KeyPath', *)')
    529540   elseif CurVal = '*' then
    530       dprintf( 'RINGCMD', 'RingCheckModifyConfigKey')
     541      --dprintf( 'RINGCMD', 'RingCheckModifyConfigKey')
    531542      'RingCheckModify'
    532       WriteConfigKey( KeyPath, rc)
    533       --dprintf( '   RingCheckModifyConfigKey: WriteConfigKey( 'KeyPath', 'rc')')
    534    endif
     543      CheckRc = rc
     544      --dprintf( '   RingCheckModifyConfigKey: RingCheckModify sets CheckRc = 'CheckRc)
     545      WriteConfigKey( KeyPath, CheckRc)
     546      --dprintf( '   RingCheckModifyConfigKey: WriteConfigKey( 'KeyPath', 'CheckRc')')
     547   endif
     548   rc = CheckRc
    535549
    536550; ---------------------------------------------------------------------------
    … …  
    556570; ---------------------------------------------------------------------------
    557571; Syntax: WaitForConfigKey( <timeoutms>, <keypath> [, <value>])
    558 ; Config keys are global.
     572; This is executed by the parent EPM window.
     573; Loops until config value found or timeout occurs. Waits 200 ms between
     574; checks.
     575; Config keys are global. Sets rc = 0 or rc = -22 if timeout occurs.
    559576defproc WaitForConfigKey( TimeoutMs, KeyPath)
    560    Val    = arg( 3)
    561    SleepMs = 200  -- Cycle time in ms
    562    --dprintf( 'WaitForConfigKey: TimeoutMs = 'TimeoutMs', KeyPath = 'KeyPath', Val = 'Val)
    563    --dprintf( 'Parent: WaitChildDone: reg key = 'QueryConfigKey( KeyPath)', wait for val = 'Val)
     577   CheckVal = arg( 3)
     578   SleepMs  = 200  -- Cycle time in ms
     579   --dprintf( 'WaitForConfigKey: TimeoutMs = 'TimeoutMs', KeyPath = 'KeyPath', CheckVal = 'CheckVal)
     580   --dprintf( 'Parent: WaitChildDone: reg key = 'QueryConfigKey( KeyPath)', wait for val = 'CheckVal)
    564581
    565582   fChildDone = 0
    … …  
    575592
    576593      CurVal = QueryConfigKey( KeyPath)
    577       if Val = '*' then
     594      if CheckVal = '*' then
    578595         if CurVal = '*' then
    579596            fChildDone = 1
    580597            leave
    581598         endif
    582       elseif Val = '' then
    583          -- No Val specified: Check for any CurVal
     599      elseif CheckVal = '' then
     600         -- No CheckVal specified: Check for any CurVal
    584601         if CurVal <> '*' then
    585602            fChildDone = 1
    … …  
    587604         endif
    588605      else
    589          -- Val specified: Check for word within CurVal
    590          if wordpos( Val, CurVal) then
     606         -- CheckVal specified: Check for word within CurVal
     607         if wordpos( CheckVal, CurVal) then
    591608            fChildDone = 1
    592609            leave
    … …  
    599616   if fChildDone then
    600617      rc = 0
    601       --dprintf( 'Parent: WaitChildDone: ChildDone: 'CurVal)
     618      --dprintf( '   WaitForConfigKey: rc = 'rc', CurVal = 'CurVal', CheckVal = 'CheckVal)
    602619   else
    603       rc = 1
    604       --dprintf( 'Parent: WaitChildDone: timeout')
     620      rc = -22
     621      --dprintf( '   WaitForConfigKey: timeout')
    605622   endif
    606623
    … …  
    631648         rc = -269  -- User Break. Command halted
    632649         stop
     650         --leave
    633651      endif
    634652   enddo
    … …  
    746764
    747765; ---------------------------------------------------------------------------
    748 ; When a non-temporary file (except .Untitled) in ring is modified, then
    749 ; -  make this file topmost
    750 ; -  give a message
    751 ; -  set rc = 1 (but not required, because stop is used)
    752 ; -  stop processing of calling command or procedure.
    753 ; Otherwise set rc = 0.
     766; This calls CheckModify for every loaded file. It return CheckRc from it.
     767; On Restart virtual files are not checked, because they are saved to disk
     768; by SaveNextLastRing.
     769; CheckModify switches to a modified file and opens a messgae box for to
     770; save/discard/cancel.
    754771; This ensures that special files can be closed without popping up a message
    755772; box that asks "Are you sure?"
    756773defc RingCheckModify
    757    rc = 0
     774   CheckRc = 0
    758775   getfileid fid
    759776   startfid = fid
    … …  
    761778   'VSyncCursor'
    762779
     780   fRestart = (GetCheckModifyRestart() == 1)
     781   --dprintf( 'RingCheckModify: fRestart = 'fRestart)
    763782   do i = 1 to filesinring( 1)  -- just as an upper limit
    764783      Mode = GetMode()
    … …  
    766785         --dprintf( 'RingCheckModify: not included, .filename = '.filename', Mode = 'Mode)
    767786         -- nop
    768 
    769       -- Don't check virtual files
    770       elseif not IsVirtual() then
     787      elseif IsVirtual() & fRestart then
     788         --dprintf( 'RingCheckModify: IsVirtual & fRestart => ignored, .filename = '.filename)
     789         -- Don't check virtual files on Restart, they are saved in
     790         -- SaveNextLastRing. SaveNextLastRing is executed e.g. on Restart,
     791         -- but not here.
     792         -- nop
     793      else
    771794         --dprintf( 'RingCheckModify: .filename = '.filename)
    772          rcx = CheckModify()
    773          --dprintf( 'RingCheckModify: CheckModify() returns rcx = 'rcx)
    774          if rcx then
     795         CheckRc = CheckModify()
     796         --dprintf( 'RingCheckModify: CheckModify() returns CheckRc = 'CheckRc)
     797         if CheckRc then
    775798            activatefile startfid
    776             rc = rcx
    777             stop
    778             --leave
     799            leave
    779800         endif
    780801      endif
    … …  
    786807      endif
    787808   enddo
     809   rc = CheckRc
    788810
    789811; ---------------------------------------------------------------------------
    790812defc CheckModify
    791    rcx = CheckModify()
    792    if rcx then
     813   CheckRc = CheckModify()
     814   rc = CheckRc
     815   if CheckRc then
    793816      stop
    794817   endif
    … …  
    796819; ---------------------------------------------------------------------------
    797820; Resets .modify for Yes or No button. Yes: Save, No: Discard.
    798 ;    Button  Action   rc
    799 ;    Yes     Save      0
    800 ;    No      Discard   0
    801 ;    Cancel  -        -5
     821;    Button  Action    rc
     822;    Yes     Save        0
     823;    No      Discard     0
     824;    Cancel  -        -293
    802825defproc CheckModify
    803    rc = 0
     826   CheckRc = 0
    804827   if .modify then
    805828      refresh
    … …  
    817840      elseif rcx = MBID_NO then
    818841         .modify = 0
    819       else
    820          rc = -5
    821       endif
    822 
    823       --dprintf( 'CheckModify: rc from msg box = 'rc)
    824    endif
    825    return rc
     842      else          -- Cancel
     843         CheckRc = -293  -- has been modified
     844      endif
     845
     846      --dprintf( 'CheckModify: CheckRc from msg box = 'CheckRc)
     847   endif
     848   return CheckRc
    826849
    827850; ---------------------------------------------------------------------------
    … …  
    10971120      SetCheckModifyOptions()
    10981121
     1122      'CheckAllRingsModify'
     1123      --dprintf( 'Restart: rc from CheckAllRingsModify = 'rc)
     1124      if rc then
     1125         return
     1126      endif
     1127
    10991128      -- This saves all rings to config. Because the restart flag is set,
    11001129      -- the windows of all rings except the current window are closed.
    … …  
    11681197   FirstFid = ''
    11691198   NextKey = ''
    1170    'HookAdd load ResetSaveOnRestartFileName 'Num
    11711199   do while NepmdGetNextConfigKey( -3, NextKeyPath, 'K', NextKey)
    11721200      if not IsNum( NextKey) then
    … …  
    12161244
    12171245; ---------------------------------------------------------------------------
    1218 defc ResetSaveOnRestartFileName
    1219    Num = arg( 1)
    1220    RestartDir = GetTmpPath()'nepmd\restart'
    1221    RestartNumDir = RestartDir'\'Num
    1222    LenRestartNumDir = length( RestartNumDir)
    1223    if leftstr( .filename, LenRestartNumDir) = RestartNumDir then
    1224       --dprintf( 'ResetSaveOnRestartFileName: File found in RestartNumDir: '.filename)
    1225       if IsAShellFilename( .filename) then
    1226          -- Use next free shell number, not stored one
    1227          .filename = GetDefaultShellFilename()
    1228       else
    1229          -- Use name without path
    1230          .filename = GetFileSpec( 'N', .filename)
    1231       endif
    1232       -- No extra titlebar refresh required. This is done by the load hook.
    1233    else
    1234       --dprintf( 'ResetSaveOnRestartFileName: File not found in RestartNumDir: '.filename)
     1246; This is executed per file
     1247defc RestoreFilename
     1248   Filename = strip( arg( 1))
     1249   if Filename <> '' then
     1250      .filename = Filename
    12351251   endif
    12361252
    … …  
    12431259
    12441260   KeyPath = arg( 1)
     1261   --dprintf( 'RestoreAllLastRings: ----------------------------------------------')
    12451262
    12461263   -- Query all numbers at once with queryprofile,
    … …  
    13031320         endif
    13041321      endif
    1305 
    1306       -- Delete 'ResetSaveOnRestartFileName 'Num from load hook
    1307       'AtPostStartup PostMe HookDel load ResetSaveOnRestartFileName 'Num
    13081322   enddo
    13091323   if fFirstRing then
    13101324      -- Cleanup restart tree on disk
    1311       'AtPostStartup PostMe DeleteRestartTree'
     1325      --'AtPostStartup PostMe DeleteRestartTree'
     1326
     1327      -- Delay required to restart virtual files from all rings reliable
     1328      'AtPostStartup PostMe mc ;Sleep 2000;DeleteRestartTree'
    13121329   endif
    13131330
Note: See TracChangeset for help on using the changeset viewer.