teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #353 from OpenMW/master

Browse source 
Add OpenMW commits up to 4 Dec 2017
This commit is contained in:
David Cernat 2017-12-04 04:38:38 +02:00 committed by GitHub
commit 07f0cc2b0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CI/before_script.msvc.sh
View file

@ -350,9 +350,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
fi fi
# SDL2 # SDL2
download "SDL 2.0.4" \ download "SDL 2.0.7" \
"https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip" \ "https://www.libsdl.org/release/SDL2-devel-2.0.7-VC.zip" \
"SDL2-2.0.4.zip" "SDL2-2.0.7.zip"
fi fi
cd .. #/.. cd .. #/..
@ -632,18 +632,18 @@ cd $DEPS
echo echo
# SDL2 # SDL2
printf "SDL 2.0.4... " printf "SDL 2.0.7... "
{ {
if [ -d SDL2-2.0.4 ]; then if [ -d SDL2-2.0.7 ]; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf SDL2-2.0.4 rm -rf SDL2-2.0.7
eval 7z x -y SDL2-2.0.4.zip $STRIP eval 7z x -y SDL2-2.0.7.zip $STRIP
fi fi
export SDL2DIR="$(real_pwd)/SDL2-2.0.4" export SDL2DIR="$(real_pwd)/SDL2-2.0.7"
add_runtime_dlls "$(pwd)/SDL2-2.0.4/lib/x${ARCHSUFFIX}/SDL2.dll" add_runtime_dlls "$(pwd)/SDL2-2.0.7/lib/x${ARCHSUFFIX}/SDL2.dll"
echo Done. echo Done.
} }

3
apps/openmw/mwgui/container.cpp
View file

@ -266,7 +266,8 @@ namespace MWGui
WindowBase::onClose(); WindowBase::onClose();
mModel->onClose(); if (mModel)
mModel->onClose();
} }
void ContainerWindow::onCloseButtonClicked(MyGUI::Widget* _sender) void ContainerWindow::onCloseButtonClicked(MyGUI::Widget* _sender)