midfavila/TinyX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Don't crash if the card init failed

Browse Source
This commit is contained in:
Lauri Kasanen 2013-12-13 16:11:35 +02:00
parent 2eba4e5832
commit a11245fcf0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kdrive/src/kdrive.c
View File

@ -1172,7 +1172,6 @@ KdAddScreen(ScreenInfo * pScreenInfo,
void KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{
KdCardInfo *card;
KdScreenInfo *screen;
if (!kdCardInfo) {
@ -1182,9 +1181,11 @@ void KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
screen = KdScreenInfoAdd(card);
KdParseScreen(screen, 0);
}
/*
* Initialize all of the screens for all of the cards
*/
int found = 0;
for (card = kdCardInfo; card; card = card->next) {
int ret = 1;
@ -1194,9 +1195,12 @@ void KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
for (screen = card->screenList; screen;
screen = screen->next)
KdInitScreen(pScreenInfo, screen, argc, argv);
found = 1;
}
}
if (!found) return;
/*
* Merge the various pixmap formats together, this can fail
* when two screens share depth but not bitsPerPixel