amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed install script and set selection window crash.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1366 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2009-01-18 04:00:50 +00:00
parent 46454d9e97
commit 4e772d14da
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
-2
View File
@@ -3030,8 +3030,6 @@ else
fi fi
# Do not pass -O2, because that causes failures for now.
CXXFLAGS=-g
# Checks for libraries. # Checks for libraries.
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
src/gui/welcome_window.cpp
+4 -4
View File
@@ -97,11 +97,11 @@ void WelcomeWindow::draw(DC& dc) {
} }
void WelcomeWindow::onOpenSet(wxCommandEvent&) { void WelcomeWindow::onOpenSet(wxCommandEvent&) {
wxFileDialog dlg(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN); wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN);
if (dlg.ShowModal() == wxID_OK) { if (dlg->ShowModal() == wxID_OK) {
settings.default_set_dir = dlg.GetDirectory(); settings.default_set_dir = dlg->GetDirectory();
wxBusyCursor wait; wxBusyCursor wait;
close(import_set(dlg.GetPath())); close(import_set(dlg->GetPath()));
} }
} }
tools/linux-installer/install
+1 -8
View File
@@ -15,14 +15,7 @@ case $UID in
*) *)
INSTALL_DIR='$HOME/.magicseteditor/'; INSTALL_DIR='$HOME/.magicseteditor/';
EXEC_SYMLINK='$HOME/bin/magicseteditor'; EXEC_SYMLINK='$HOME/bin/magicseteditor';
esac esac;
if [ \"$MSE_INSTALL_DIR\" != "" ] then
INSTALL_DIR=$MSE_INSTALL_DIR
fi
if [ \"$MSE_EXEC_SYMLINK\" != "" ] then
INSTALL_DIR=$MSE_EXEC_SYMLINK
fi
echo "Magic Set Editor version $VERSION Installer Script. echo "Magic Set Editor version $VERSION Installer Script.