From 34760f7f3ae99215ee16b235d8ccaeeaac1e5c8b Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 27 Aug 2009 12:19:03 +0000 Subject: [PATCH] Use a local variable for the elf name. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1689 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/Linux/DebugDlg.h | 1 - pcsx2/Linux/LnxMain.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pcsx2/Linux/DebugDlg.h b/pcsx2/Linux/DebugDlg.h index c98fb1571d..b18d796204 100644 --- a/pcsx2/Linux/DebugDlg.h +++ b/pcsx2/Linux/DebugDlg.h @@ -35,7 +35,6 @@ GtkWidget *MemWriteDlg, *MemEntry, *DataEntry; GtkAdjustment *DebugAdj; extern int efile; -extern char elfname[g_MaxPath]; int DebugMode; // 0 - EE | 1 - IOP static u32 dPC, dBPA = -1, dBPC = -1; diff --git a/pcsx2/Linux/LnxMain.cpp b/pcsx2/Linux/LnxMain.cpp index 0350f30709..fae6eeb4e1 100644 --- a/pcsx2/Linux/LnxMain.cpp +++ b/pcsx2/Linux/LnxMain.cpp @@ -391,13 +391,15 @@ static CDVD_SourceType source = CDVDsrc_NoDisc; void OnRunElf_Ok(GtkButton* button, gpointer user_data) { - g_Startup.ElfFile = gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel)); + char *elf_name; + + elf_name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel)); gtk_widget_destroy(FileSel); SysReset(); CDVDsys_ChangeSource( source ); OpenCDVD( NULL ); - SysPrepareExecution(g_Startup.ElfFile); + SysPrepareExecution(elf_name); } void OnRunElf_Cancel(GtkButton* button, gpointer user_data)