X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/ce4ed8bcf239ea532cc54bd872995a687de1c299..1574cddbc1107a6119116328e9696a65108f867b:/modules/Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 85b5fcf..1479e2a 100644
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-10-04
+# Last modified: 2004-10-22
 #
 
 use strict;
@@ -331,6 +331,14 @@ sub exec_endedit($$)
  my $content        = $data->{'cgi'}->param('filecontent');
  my $uselist        = $data->{'uselist'};
 
+ # We already unlock the file at the beginning of the
+ # subroutine, because if we have to abort this routine,
+ # the file keeps locked.
+ # Nobody else will access the file during this routine
+ # because of the concept of File::UseList.
+
+ file_unlock($uselist,$virtual);
+
  # Normalize newlines
 
  $content =~ s/\015\012|\012|\015/\n/g;
@@ -362,11 +370,6 @@ sub exec_endedit($$)
  {
   # Saving of the file was successful - so unlock it!
 
-  file_unlock($uselist,$data->{'virtual'});
-  #                    ^^^^^^^^^^^^^^^^^^
-  # Maybe the user saved the file using another filename...
-  # But we have to unlock the original file!
-
   return devedit_reload({command => 'show', file => upper_path($virtual)});
  }
  else
@@ -825,10 +828,13 @@ sub exec_unlock($$)
 {
  my ($data,$config) = @_;
  my $virtual        = $data->{'virtual'};
+ my $uselist        = $data->{'uselist'};
+
+ return devedit_reload({command => 'show', file => upper_path($virtual)}) if($uselist->unused($virtual));
 
  if($data->{'cgi'}->param('confirmed'))
  {
-  file_unlock($data->{'uselist'},$virtual);
+  file_unlock($uselist,$virtual);
   return devedit_reload({command => 'show', file => upper_path($virtual)});
  }
  else