[Kde-games-devel] Review Request 114674: Fix bug 310411: Crash when selecting 'Game>Restart puzzle'

[Albert Astals Cid]

> On Dec. 27, 2013, 4:33 p.m., Albert Astals Cid wrote:
> > Makes sense :-)
> > 
> > Any reason you only want to commit to master and not KDE/4.11 and then merge to 4.12 and master?
> 
> Ian Wadham wrote:
>     None, apart from the fact I do not know or have forgotten how to do what you suggest. I think I can figure out how to commit to master and cherry-pick back into those other branches.
>     
>     BTW, is there going to be a KDE 4.13? I see no schedule for it.

Well it's basically

git checkout KDE/4.11
make the changes
git commit -a
git push origin KDE/4.11
git checkout KDE/4.12
git merge origin/KDE/4.11
git commit -a
git push origin KDE/4.12
git checkout master
git merge origin/KDE/4.12
git commit -a
git push origin master

If you feel usafe i can do it for you.

Yes, there will be a 4.13, and yes, there's no schedule for it yet.


- Albert


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/114674/#review46195
-----------------------------------------------------------


On Dec. 26, 2013, 9:49 p.m., Ian Wadham wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/114674/
> -----------------------------------------------------------
> 
> (Updated Dec. 26, 2013, 9:49 p.m.)
> 
> 
> Review request for KDE Games.
> 
> 
> Bugs: 310411
>     http://bugs.kde.org/show_bug.cgi?id=310411
> 
> 
> Repository: palapeli
> 
> 
> Description
> -------
> 
> The problem occurs because no puzzle has been selected and loaded when Palapeli starts, therefore there is no puzzle to "restart".
> 
> The solution is to enable 'Game>Restart puzzle' only when a puzzle has been selected and loaded and is being solved (the action makes no sense in Palapeli's Collection mode), also to return immediately from Palapeli::Scene:restartPuzzle() if, for any other reason, no puzzle has been successfully loaded. 
> 
> 
> Diffs
> -----
> 
>   src/engine/scene.cpp 8be0925 
>   src/window/mainwindow.cpp e3305fb 
> 
> Diff: https://git.reviewboard.kde.org/r/114674/diff/
> 
> 
> Testing
> -------
> 
> Tried 'Game>Restart puzzle' from Collection mode (no action) and from Puzzle mode (puzzle pieces are dismantled and re-shuffled, as expected).
> 
> 
> Thanks,
> 
> Ian Wadham
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-games-devel/attachments/20131228/dbccf9dc/attachment.html>