Patch for index out of bounds, #340

cehbab wants to merge 2 commits intotjackenpacken:mastertjackenpacken/taskbar-groups:masterfrom

cehbab:mastercehbab/taskbar-groups:masterCopy head branch name to clipboard