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

fixed: errors in templates could cause program to hang/crash

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@796 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-12-29 21:12:11 +00:00
parent eed8ba4274
commit e49f2eebcb
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/style_panel.cpp
+3
View File
@@ -108,6 +108,9 @@ void StylePanel::selectCard(const CardP& card) {
void StylePanel::onStyleSelect(wxCommandEvent&) { void StylePanel::onStyleSelect(wxCommandEvent&) {
if (list->hasSelection() && card) { if (list->hasSelection() && card) {
StyleSheetP stylesheet = list->getSelection<StyleSheet>(); StyleSheetP stylesheet = list->getSelection<StyleSheet>();
if (stylesheet->game != set->game) {
throw PackageError(_("Stylesheet made for the wrong game"));
}
if (stylesheet == set->stylesheet) { if (stylesheet == set->stylesheet) {
// select no special style when selecting the same style as the set default // select no special style when selecting the same style as the set default
stylesheet = StyleSheetP(); stylesheet = StyleSheetP();
src/render/value/image.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ IMPLEMENT_VALUE_VIEWER(Image);
void ImageValueViewer::draw(RotatedDC& dc) { void ImageValueViewer::draw(RotatedDC& dc) {
// reset? // reset?
int w = (int)dc.trX(style().width), h = (int)dc.trY(style().height); int w = max(0,(int)dc.trX(style().width)), h = max(0,(int)dc.trY(style().height));
int a = dc.trAngle(0); //% TODO : Add getAngle()? int a = dc.trAngle(0); //% TODO : Add getAngle()?
if (bitmap.Ok() && (a != angle || size.width != w || size.height != h)) { if (bitmap.Ok() && (a != angle || size.width != w || size.height != h)) {
bitmap = Bitmap(); bitmap = Bitmap();