From be74ee42e043bba09663798054e2ba27a41916f5 Mon Sep 17 00:00:00 2001
From: Chixpy <chixpy@gmail.com>
Date: Mon, 28 May 2018 22:44:42 +0200
Subject: [PATCH] =?UTF-8?q?*=20Arreglado=20un=20peque=C3=B1o=20errorcillo:?=
 =?UTF-8?q?=20En=20las=20opciones=20`Crear=20AVI`=20y=20`Reproducir=20INP`?=
 =?UTF-8?q?,=20si=20se=20cancela=20el=20seleccionar=20un=20archivo=20.inp?=
 =?UTF-8?q?=20entonces=20la=20ventana=20principal=20se=20quedaba=20desacti?=
 =?UTF-8?q?vada=20y=20dejaba=20de=20funcionar.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LNSCompFE.wiki                |   2 +-
 Source/Forms/ufrLNSCompFE.pas |  16 ++++++++--------
 Source/LNSCompFE.lpi          |   2 +-
 Source/LNSCompFE.res          | Bin 198043 -> 198043 bytes
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/LNSCompFE.wiki b/LNSCompFE.wiki
index 3ed0e3e..3032852 160000
--- a/LNSCompFE.wiki
+++ b/LNSCompFE.wiki
@@ -1 +1 @@
-Subproject commit 3ed0e3e2be0f716432d671aef8f1264c96a1eabd
+Subproject commit 3032852ef2209d008f359a7d8f7dca0d87158e7c
diff --git a/Source/Forms/ufrLNSCompFE.pas b/Source/Forms/ufrLNSCompFE.pas
index a24d4bf..c8c9d69 100644
--- a/Source/Forms/ufrLNSCompFE.pas
+++ b/Source/Forms/ufrLNSCompFE.pas
@@ -49,6 +49,8 @@ interface
   krsCSVSep = ',';
 
   krsParamCrearINPFmt = '%0:s -afs -throttle -speed 1 -rec %0:s.inp';
+  krsParamReprINPFmt = '%0:s -afs -throttle -speed 1 -input_directory "%1:s"'
+    +' -pb "%2:s" -inpview 1 -inplayout standard';
   krsParamCrearAVIFmt = '%0:s -noafs -fs 0 -nothrottle -input_directory "%1:s"'
     + ' -pb "%2:s" -exit_after_playback -aviwrite "%3:s"';
 
@@ -743,8 +745,6 @@ procedure TfrmLNSCompFE.ReproducirINP;
   if Juego = '' then
     Exit;
 
-  Enabled := False;
-
   SetDlgInitialDir(OpenINP, INPFolder);
   OpenINP.Filter := 'Partidas de ' + Juego + '|' + Juego +
     '*.inp|Todos lo ficheros INP |*.inp|Todos lo ficheros|*.*';
@@ -752,6 +752,8 @@ procedure TfrmLNSCompFE.ReproducirINP;
   if not OpenINP.Execute then
     Exit;
 
+  Enabled := False;
+
   MAMEFolder := ExtractFileDir(MAMEExe);
   CurrFolder := GetCurrentDirUTF8;
 
@@ -762,10 +764,8 @@ procedure TfrmLNSCompFE.ReproducirINP;
 
   // El directorio del fichero INP tiene que estar definido por
   //   -input_directory ya que -pb no acepta rutas
-  ExecuteProcess(MAMEExe, Juego + ' -input_directory inp -afs -throttle' +
-    ' -speed 1 -input_directory "' + ExtractFileDir(OpenINP.FileName) +
-    '" -pb "' + ExtractFileName(OpenINP.FileName) +
-    '" -inpview 1 -inplayout standard');
+  ExecuteProcess(MAMEExe, Format(krsParamReprINPFmt, [Juego,
+    ExtractFileDir(OpenINP.FileName), ExtractFileName(OpenINP.FileName)]));
 
   NVRAMRestore;
 
@@ -785,8 +785,6 @@ procedure TfrmLNSCompFE.CrearAVI;
   if Juego = '' then
     Exit;
 
-  Enabled := False;
-
   SetDlgInitialDir(OpenINP, INPFolder);
   OpenINP.Filter := 'Partidas de ' + Juego + '|' + Juego +
     '*.inp|Todos lo ficheros INP |*.inp|Todos lo ficheros|*.*';
@@ -794,6 +792,8 @@ procedure TfrmLNSCompFE.CrearAVI;
   if not OpenINP.Execute then
     Exit;
 
+  Enabled := False;
+
   MAMEFolder := ExtractFileDir(MAMEExe);
   CurrFolder := GetCurrentDirUTF8;
 
diff --git a/Source/LNSCompFE.lpi b/Source/LNSCompFE.lpi
index 775d013..410c498 100644
--- a/Source/LNSCompFE.lpi
+++ b/Source/LNSCompFE.lpi
@@ -23,7 +23,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
-      <BuildNr Value="6"/>
+      <BuildNr Value="7"/>
       <StringTable Comments="FrontEnd para usar con (Wolf)MAME para grabar INP limpiando NVRAM, DIFF y HI" FileDescription="FrontEnd para las competiciones de Las Noches Skyperas" InternalName="LNSCompFE" LegalCopyright="(C) 2017-2018 Chixpy" OriginalFilename="LNSCompFE.exe" ProductName="LNSCompFE" ProductVersion="0.0.0.0"/>
     </VersionInfo>
     <BuildModes Count="2">
diff --git a/Source/LNSCompFE.res b/Source/LNSCompFE.res
index d26e154dedfe10e6877b065465ce18e84fd4094c..fb725ff274ceafed4723e091a55818742ad5ede3 100644
GIT binary patch
delta 31
ncmbQ;%`>~3XTu3LM)u7o+4Pwi&6|I6w*Ta0-2Ri3Y0+;0y3q_i

delta 31
ncmbQ;%`>~3XTu3LMz+l-+4Pwi&6<C5w*Ta0-2Ri3Y0+;0x~>d7