Merge branch 'master' of https://github.com/jp9000/obs-studio

2014-01-24 21:20:30 -07:00
parent 092f36fac4 e3299d5662
commit dd396c646a
4 changed files with 6 additions and 3 deletions
--- a/obs/qt-wrappers.cpp
+++ b/obs/qt-wrappers.cpp
@@ -46,6 +46,6 @@ void QTToGSWindow(QWidget *widget, gs_window &gswindow)
 #elif __APPLE__
 	/* TODO: mac */
 #else
-	/* TODO: unix */
+	gswindow.id = widget->winId();
 #endif
 }