[gnome-sudoku/gnome-3-12] Fix exception when starting new game
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku/gnome-3-12] Fix exception when starting new game
- Date: Sun, 29 Jun 2014 20:23:47 +0000 (UTC)
commit 62dd0cc9c6c73263794e0bbdbcb1d0a959a58fdc
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Jun 29 15:21:59 2014 -0500
Fix exception when starting new game
https://bugzilla.gnome.org/show_bug.cgi?id=703335
src/lib/gsudoku.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/lib/gsudoku.py b/src/lib/gsudoku.py
index 922bd0e..e5cd026 100644
--- a/src/lib/gsudoku.py
+++ b/src/lib/gsudoku.py
@@ -478,7 +478,7 @@ class SudokuGameDisplay (SudokuNumberGrid, GObject.GObject):
are stored in InteractiveGrid.conflicts
'''
# Return if there are no conflicts for this cell
- if (x, y) not in self.grid.conflicts:
+ if not self.grid or (x, y) not in self.grid.conflicts:
return
# Highlight the current cell
self.__entries__[(x, y)].set_error_highlight(True)
@@ -568,7 +568,7 @@ class SudokuGameDisplay (SudokuNumberGrid, GObject.GObject):
If any conflicts were cleared on the last remove() then they are
stored in grid.cleared_conflicts
'''
- if not self.grid.cleared_conflicts:
+ if not self.grid or not self.grid.cleared_conflicts:
return
for coord in self.grid.cleared_conflicts:
linked_entry = self.__entries__[coord]
@@ -709,7 +709,8 @@ class SudokuGameDisplay (SudokuNumberGrid, GObject.GObject):
if track:
for coord in list(track.keys()):
self.__entries__[coord].set_value(0, tracker_info.NO_TRACKER)
- self.grid.remove(*coord)
+ if self.grid:
+ self.grid.remove(*coord)
self.remove_error_highlight()
self.mark_impossible_implications(*coord)
if hide:
@@ -731,7 +732,8 @@ class SudokuGameDisplay (SudokuNumberGrid, GObject.GObject):
self.__entries__[(x, y)].set_value(value, self.tinfo.showing_tracker)
self.__entries__[(x, y)].recolor(self.tinfo.showing_tracker)
# Add it to the underlying grid
- self.grid.add(x, y, value, True)
+ if self.grid:
+ self.grid.add(x, y, value, True)
# Highlight any conflicts that the new value creates
self.highlight_conflicts(x, y)
# Draw our entry
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]