diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-17 14:46:01 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-17 14:46:01 (GMT) |
| commit | 60f3e3abbb9bfd61448a761701159cf880e66c19 (patch) | |
| tree | fabe4b9f586d17f6ecc097599d841148e0a71894 /src/opengl/qgl_win.cpp | |
| parent | e43cf7a591fc98c544c620e0722bdd1201feaea9 (diff) | |
| parent | a7ef2d899d711d750238a8d69284da808188b407 (diff) | |
| download | Qt-60f3e3abbb9bfd61448a761701159cf880e66c19.zip Qt-60f3e3abbb9bfd61448a761701159cf880e66c19.tar.gz Qt-60f3e3abbb9bfd61448a761701159cf880e66c19.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/opengl/qgl_win.cpp')
| -rw-r--r-- | src/opengl/qgl_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index b5f952e..5ab944a 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -1280,8 +1280,9 @@ void QGLContext::reset() void QGLContext::makeCurrent() { Q_D(QGLContext); - if (d->rc == wglGetCurrentContext() || !d->valid) // already current + if (d->rc == wglGetCurrentContext() || !d->valid) // already current return; + if (d->win) { d->dc = GetDC(d->win); if (!d->dc) { |