From b38fa5a07ab1f5604372176c8e84ddfb075133ee Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 7 Mar 2009 19:53:00 +0000
Subject: unclutter Umain: ConversionFileName moved to UScreenEditConvert

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1626 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/UMain.pas                 | 2 --
 src/screens/UScreenEditConvert.pas | 3 +++
 src/screens/UScreenOpen.pas        | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index bc1cc7cc..7cd69c24 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -91,8 +91,6 @@ type
 var
 
   Done:             boolean;
-  // FIXME: ConversionFileName should not be global
-  ConversionFileName: string;
   Restart:            boolean;
 
   // player and music info
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8ef43770..89fd64c5 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -116,6 +116,9 @@ type
       procedure onHide; override;
   end;
 
+var
+  ConversionFileName: string;
+
 implementation
 
 uses
diff --git a/src/screens/UScreenOpen.pas b/src/screens/UScreenOpen.pas
index c4d773e7..fe9f0664 100644
--- a/src/screens/UScreenOpen.pas
+++ b/src/screens/UScreenOpen.pas
@@ -74,6 +74,7 @@ uses
   UGraphic,
   UDraw,
   UMain,
+  UScreenEditConvert,
   USkins;
 
 function TScreenOpen.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
-- 
cgit v1.2.3