Review Request 123417: Prevent plasmashell from crashing on wayland

[Nerdopolis Turfwalker]

> On April 20, 2015, 5:48 a.m., Martin Gräßlin wrote:
> > src/kidletime.cpp, lines 193-194
> > <https://git.reviewboard.kde.org/r/123417/diff/1/?file=362046#file362046line193>
> >
> >     suggestion: merge the two ifs with an &&. If isPlatformX11 is false, the other condition isn't checked, so it's save

I actually realized I had to restructure this part as I had it wrong, and preventing it from using XScreensaverBasedPoller. Also setting poller=0 caused a crash in !poller->isAvailable(), (I don't know how I missed it the first time), So I merged the if statement that checks if it's NULL instead. First it checks if it's NULL, then it checks if it's availible. I retested, and plasmashell did not crash


- Nerdopolis


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


On April 22, 2015, 1:18 a.m., Nerdopolis Turfwalker wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123417/
> -----------------------------------------------------------
> 
> (Updated April 22, 2015, 1:18 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: kidletime
> 
> 
> Description
> -------
> 
> kidletime makes an unchecked X call, which is used by plasmashell.
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 5335bd5db171721635517a82829f54cd1b3f6326 
>   src/config-kidletime.h.cmake d3f0cfd78833d2b3acf90d0a068905676ceba586 
>   src/kidletime.cpp f38ae467d78d899b70b602a932482a39402793fb 
> 
> Diff: https://git.reviewboard.kde.org/r/123417/diff/
> 
> 
> Testing
> -------
> 
> Ran plasmashell with QT_QPA_PLATFORM=wayland, and got no more crashes
> 
> 
> Thanks,
> 
> Nerdopolis Turfwalker
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150422/71ecea21/attachment.html>