diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-20 20:16:18 -0400 |
| commit | 94a484dd7e224ef6f4fc5994fa50478d41f72638 (patch) | |
| tree | 5d91fbb0d1ebeeb1cf0a9ab266effb29ce4c1764 /widget/GfxInfoX11.cpp | |
| parent | 754ad610489603f80ea38bbd2cf18b28f0d8bf1d (diff) | |
| parent | b3bf60f4264b9acfbd2cb34fed4a66915012803c (diff) | |
| download | UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.gz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.lz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.tar.xz UXP-94a484dd7e224ef6f4fc5994fa50478d41f72638.zip | |
Merge branch 'master' into xulrunner
Diffstat (limited to 'widget/GfxInfoX11.cpp')
| -rw-r--r-- | widget/GfxInfoX11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp index 4297aaa93..48fc3dbb5 100644 --- a/widget/GfxInfoX11.cpp +++ b/widget/GfxInfoX11.cpp @@ -23,7 +23,7 @@ NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) #endif // these global variables will be set when firing the glxtest process -int glxtest_pipe = 0; +int glxtest_pipe = -1; pid_t glxtest_pid = 0; nsresult @@ -50,8 +50,8 @@ GfxInfo::GetData() // to understand this function, see bug 639842. We retrieve the OpenGL driver information in a // separate process to protect against bad drivers. - // if glxtest_pipe == 0, that means that we already read the information - if (!glxtest_pipe) + // if glxtest_pipe == -1, that means that we already read the information + if (glxtest_pipe == -1) return; enum { buf_size = 1024 }; @@ -60,7 +60,7 @@ GfxInfo::GetData() &buf, buf_size-1); // -1 because we'll append a zero close(glxtest_pipe); - glxtest_pipe = 0; + glxtest_pipe = -1; // bytesread < 0 would mean that the above read() call failed. // This should never happen. If it did, the outcome would be to blacklist anyway. |