diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
| commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
| tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /xorg-server/hw/kdrive/src/kdrive.c | |
| parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
| parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
| download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/hw/kdrive/src/kdrive.c')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c index f2426ca43..d56ba8fc5 100644 --- a/xorg-server/hw/kdrive/src/kdrive.c +++ b/xorg-server/hw/kdrive/src/kdrive.c @@ -330,7 +330,8 @@ KdParseScreen(KdScreenInfo * screen, const char *arg) screen->height = pixels; screen->height_mm = mm; } - if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y') + if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y' && + (delim != '\0' || i == 0)) return; } |