Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed double files, causes issues on Windows #13

Merged
merged 1 commit into from Dec 27, 2013
Merged

Fixed double files, causes issues on Windows #13

merged 1 commit into from Dec 27, 2013

Conversation

computerquip
Copy link
Contributor

No description provided.

jp9000 added a commit that referenced this pull request Dec 27, 2013
Fixed double files, causes issues on Windows
@jp9000 jp9000 merged commit de7005f into obsproject:master Dec 27, 2013
palana added a commit that referenced this pull request Nov 6, 2015
This works around a crash in the "widget->clear()" call in
ClearListItems under the following circumstances:
- Create at least two scenes
- Create at least one source in both scenes
- Have at least one source selected in both scenes
- Set the same "Switch to scene" hotkey on both scenes
- Use "Switch to scene" hotkey

Reduced stack trace on my machine:
    frame #0: 0x00000001004bac2d QtWidgets`QWidget::show() + 93
    frame #1: 0x00000001006d32a2 QtWidgets`QAbstractItemView::updateEditorGeometries() + 690
    frame #2: 0x00000001006d36d7 QtWidgets`QAbstractItemView::updateGeometries() + 23
    frame #3: 0x00000001006f1ae6 QtWidgets`QListView::updateGeometries() + 438
    frame #4: 0x00000001006ccdce QtWidgets`QAbstractItemView::doItemsLayout() + 46
    frame #5: 0x00000001006f1916 QtWidgets`QListView::doItemsLayout() + 214
    frame #6: 0x00000001006f9cf3 QtWidgets`QListViewPrivate::rectForIndex(QModelIndex const&) const + 611
    frame #7: 0x00000001006eb48d QtWidgets`QListView::visualRect(QModelIndex const&) const + 29
    frame #8: 0x00000001006f1567 QtWidgets`QListView::visualRegionForSelection(QItemSelection const&) const + 1863
    frame #9: 0x00000001006d7ba9 QtWidgets`QAbstractItemView::selectionChanged(QItemSelection const&, QItemSelection const&) + 73
    frame #10: 0x00000001006f97d2 QtWidgets`QListView::selectionChanged(QItemSelection const&, QItemSelection const&) + 674
    frame #11: 0x00000001006d9b9e QtWidgets`QAbstractItemView::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) + 1246
    frame #12: 0x0000000102b10372 QtCore`QMetaObject::activate(QObject*, int, int, void**) + 2994
    frame #13: 0x0000000102aa001c QtCore`QItemSelectionModel::emitSelectionChanged(QItemSelection const&, QItemSelection const&) + 300
    frame #14: 0x0000000102a9fe6c QtCore`QItemSelectionModel::select(QItemSelection const&, QFlags<QItemSelectionModel::SelectionFlag>) + 748
    frame #15: 0x0000000102aa048b QtCore`QItemSelectionModel::clear() + 75
    frame #16: 0x000000010072e9d8 QtWidgets`QListWidget::clear() + 24
    frame #17: 0x000000010015759d obs`ClearListItems(widget=0x000000010683afa0) + 141 at item-widget-helpers.cpp:43
    frame #18: 0x000000010003424b obs`OBSBasic::UpdateSources(this=0x0000000105f5bf50, scene=(val = obs_scene * = 0x0000000110679440)), &(obs_scene_release)>) + 75 at window-basic-main.cpp:1254
    frame #19: 0x0000000100036a96 obs`OBSBasic::UpdateSceneSelection(this=0x0000000105f5bf50, source=<unavailable>), &(obs_source_release)>) + 422 at window-basic-main.cpp:1473
    frame #20: 0x0000000100175c48 obs`OBSBasic::qt_static_metacall(_o=0x0000000105f5bf50, _c=InvokeMetaMethod, _id=17, _a=0x00007fff5fbfb640) + 776 at moc_window-basic-main.cpp:494

This crash was reported at
https://obsproject.com/mantis/view.php?id=364
computerquip-streamlabs referenced this pull request in stream-labs/obs-studio Oct 25, 2017
Waik0 added a commit to Waik0/obs-studio that referenced this pull request May 1, 2020
# This is the 1st commit message:

rtmp-services: Modify showroom setting

Change recommend format and url.
Extend curl Timeout span.

# This is the commit message obsproject#2:

rtmp-services: remove unused code

# This is the commit message obsproject#3:

rtmp-services: showroom support autoconfig ui

# This is the commit message obsproject#4:

rtmp-services: clang format

# This is the commit message obsproject#5:

rtmp-services: Add WASDTV (obsproject#2697)


# This is the commit message obsproject#6:

CI: Add freetype dep on osx


# This is the commit message obsproject#7:

libobs: Fix plugin folder search path case on macOS

# This is the commit message obsproject#8:

linux-v4l2: Fix build with Clang 10.0

add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value

# This is the commit message obsproject#9:

CI: Add qt5-xml package for FreeBSD build task

# This is the commit message obsproject#10:

rtmp-services: Update ChathostessModels service (obsproject#2745)


# This is the commit message obsproject#11:

libobs: Don't save removed sources

# This is the commit message obsproject#12:

obs-ffmpeg: Fix media source not closing file when inactive

# This is the commit message obsproject#13:

obs-browser: Fix formatting

# This is the commit message obsproject#14:

obs-vst: Fix formatting

# This is the commit message obsproject#15:

obs-qsv11: Enable QSV texture-based encoding

Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.

# This is the commit message obsproject#16:

UI: Remove all scenes in ClearSceneData

# This is the commit message obsproject#17:

UI: Fix previewLabel styling

Label renders with default styling instead of using dynamic property
because it was already polished.

# This is the commit message obsproject#18:

docs/sphinx: Add Property Grouping

# This is the commit message obsproject#19:

plugins: Build ALSA plugin for FreeBSD

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

# This is the commit message obsproject#20:

UI: Adjust a few margins

-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.

# This is the commit message obsproject#21:

UI: Add status icons for recording and streaming

# This is the commit message obsproject#22:

CMake: Build Windows modules with file descriptors

# This is the commit message obsproject#23:

mac-capture: Use window id to identify windows on MacOS

Use a window's window id in init_window in the mac window capture plugin.

# This is the commit message obsproject#24:

mac-capture: Only find window by window id when owner name and pid match

# This is the commit message obsproject#25:

mac-capture: Use int in place of NSNumber for owner_pid

# This is the commit message obsproject#26:

mac-capture: update owner_pid in `update_window`

# This is the commit message obsproject#27:

CI: Add main Github Actions workflow for branch pushes and PRs

# This is the commit message obsproject#28:

UI: Remove unnecessary global variables

# This is the commit message obsproject#29:

Revert "UI: Remove unnecessary global variables"

This reverts commit f91d3ba.

From @pkv: the reason some of these vars were global is because Qt was not deleting them at all; as a result memory leaks have been reintroduced for: previewProjector, trayMenu, studioProgramProjector, multiviewProjectorMenu ;

# This is the commit message obsproject#30:

libobs-opengl: Fix viewport flip

Flip viewport in coordination with update_viewproj_matrix.

# This is the commit message obsproject#31:

UI: Add white icons for dock titles

- Add pop-out and close svg icons
- Update all dark themes qss with the new icons

# This is the commit message obsproject#32:

rtmp-services: Change Stripchat streaming service
Waik0 added a commit to Waik0/obs-studio that referenced this pull request May 1, 2020
# This is the 1st commit message:

rtmp-services: Modify showroom setting

Change recommend format and url.
Extend curl Timeout span.

# This is the commit message obsproject#2:

rtmp-services: remove unused code

# This is the commit message obsproject#3:

rtmp-services: showroom support autoconfig ui

# This is the commit message obsproject#4:

rtmp-services: clang format

# This is the commit message obsproject#5:

rtmp-services: Add WASDTV (obsproject#2697)


# This is the commit message obsproject#6:

CI: Add freetype dep on osx


# This is the commit message obsproject#7:

libobs: Fix plugin folder search path case on macOS

# This is the commit message obsproject#8:

linux-v4l2: Fix build with Clang 10.0

add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value

# This is the commit message obsproject#9:

CI: Add qt5-xml package for FreeBSD build task

# This is the commit message obsproject#10:

rtmp-services: Update ChathostessModels service (obsproject#2745)


# This is the commit message obsproject#11:

libobs: Don't save removed sources

# This is the commit message obsproject#12:

obs-ffmpeg: Fix media source not closing file when inactive

# This is the commit message obsproject#13:

obs-browser: Fix formatting

# This is the commit message obsproject#14:

obs-vst: Fix formatting

# This is the commit message obsproject#15:

obs-qsv11: Enable QSV texture-based encoding

Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.

# This is the commit message obsproject#16:

UI: Remove all scenes in ClearSceneData

# This is the commit message obsproject#17:

UI: Fix previewLabel styling

Label renders with default styling instead of using dynamic property
because it was already polished.

# This is the commit message obsproject#18:

docs/sphinx: Add Property Grouping

# This is the commit message obsproject#19:

plugins: Build ALSA plugin for FreeBSD

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

# This is the commit message obsproject#20:

UI: Adjust a few margins

-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.

# This is the commit message obsproject#21:

UI: Add status icons for recording and streaming

# This is the commit message obsproject#22:

CMake: Build Windows modules with file descriptors

# This is the commit message obsproject#23:

mac-capture: Use window id to identify windows on MacOS

Use a window's window id in init_window in the mac window capture plugin.

# This is the commit message obsproject#24:

mac-capture: Only find window by window id when owner name and pid match

# This is the commit message obsproject#25:

mac-capture: Use int in place of NSNumber for owner_pid

# This is the commit message obsproject#26:

mac-capture: update owner_pid in `update_window`

# This is the commit message obsproject#27:

CI: Add main Github Actions workflow for branch pushes and PRs

# This is the commit message obsproject#28:

UI: Remove unnecessary global variables

# This is the commit message obsproject#29:

Revert "UI: Remove unnecessary global variables"

This reverts commit f91d3ba.

From @pkv: the reason some of these vars were global is because Qt was not deleting them at all; as a result memory leaks have been reintroduced for: previewProjector, trayMenu, studioProgramProjector, multiviewProjectorMenu ;

# This is the commit message obsproject#30:

libobs-opengl: Fix viewport flip

Flip viewport in coordination with update_viewproj_matrix.

# This is the commit message obsproject#31:

UI: Add white icons for dock titles

- Add pop-out and close svg icons
- Update all dark themes qss with the new icons

# This is the commit message obsproject#32:

rtmp-services: Change Stripchat streaming service

# This is the commit message obsproject#33:

rtmp-services: Add VirtWish service

# This is the commit message obsproject#34:

UI: Update OSX to macOS in English translation

# This is the commit message obsproject#35:

obs-browser, obs-vst: Fix formatting

# This is the commit message obsproject#36:

CI: Fix Azure Pipelines macOS runs

# This is the commit message obsproject#37:

obs-filters: Add a user label to the LUT filter

While discussing the Flatpak RFC [1], it was spotted that the
LUT filter couldn't open the file selection dialog. It was
explained, then, that the proper formats were either composed
of "User Label (file extensions)", or "file extensions", and
the LUT filter was setting "(file extensions)" without the
actual user label.

While this works on a standard Qt file selection dialog, it
cannot be properly formatted as a set of D-Bus filters, thus
breaking the sandbox integration.

Add a simple user label to the LUT file filter.

[1] obsproject/rfcs#21 (comment)

# This is the commit message obsproject#38:

UI: Remove requirement for replay buffer hotkey

Fixes obsproject#2807

# This is the commit message obsproject#39:

obs-ffmpeg: Log why new NVENC might not be used

# This is the commit message obsproject#40:

obs-ffmpeg: Preserve error message from new NVENC

If we fallback to ffmpeg NVENC, the error from new NVENC might still be
present in the encoder structure. Given that this provides a lot more
actionable information to the user, let's use it if possible.

# This is the commit message obsproject#41:

libobs: Clear last error on encoder shutdown

This fixes an issue where an encoder may error out on a path that
doesn't use obs_encoder_set_last_error, resulting in a stale error being
used.

# This is the commit message obsproject#42:

obs-ffmpeg: Add localization for NVENC error messages

# This is the commit message obsproject#43:

obs-ffmpeg: Add error message for non-zero GPU

# This is the commit message obsproject#44:

CI: Update macOS deps to fix lua

# This is the commit message obsproject#45:

vlc-video: Enable building the plugin on FreeBSD
Waik0 added a commit to Waik0/obs-studio that referenced this pull request May 1, 2020
# This is the 1st commit message:

rtmp-services: add showroom setting

# This is the commit message obsproject#2:

rtmp-services: Modify showroom setting

Change recommend format and url.
Extend curl Timeout span.

# This is the commit message obsproject#3:

rtmp-services: remove unused code

# This is the commit message obsproject#4:

rtmp-services: showroom support autoconfig ui

# This is the commit message obsproject#5:

rtmp-services: clang format

# This is the commit message obsproject#6:

rtmp-services: Add WASDTV (obsproject#2697)


# This is the commit message obsproject#7:

CI: Add freetype dep on osx


# This is the commit message obsproject#8:

libobs: Fix plugin folder search path case on macOS

# This is the commit message obsproject#9:

linux-v4l2: Fix build with Clang 10.0

add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value

# This is the commit message obsproject#10:

CI: Add qt5-xml package for FreeBSD build task

# This is the commit message obsproject#11:

rtmp-services: Update ChathostessModels service (obsproject#2745)


# This is the commit message obsproject#12:

libobs: Don't save removed sources

# This is the commit message obsproject#13:

obs-ffmpeg: Fix media source not closing file when inactive

# This is the commit message obsproject#14:

obs-browser: Fix formatting

# This is the commit message obsproject#15:

obs-vst: Fix formatting

# This is the commit message obsproject#16:

obs-qsv11: Enable QSV texture-based encoding

Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.

# This is the commit message obsproject#17:

UI: Remove all scenes in ClearSceneData

# This is the commit message obsproject#18:

UI: Fix previewLabel styling

Label renders with default styling instead of using dynamic property
because it was already polished.

# This is the commit message obsproject#19:

docs/sphinx: Add Property Grouping

# This is the commit message obsproject#20:

plugins: Build ALSA plugin for FreeBSD

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

# This is the commit message obsproject#21:

UI: Adjust a few margins

-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.

# This is the commit message obsproject#22:

UI: Add status icons for recording and streaming

# This is the commit message obsproject#23:

CMake: Build Windows modules with file descriptors

# This is the commit message obsproject#24:

mac-capture: Use window id to identify windows on MacOS

Use a window's window id in init_window in the mac window capture plugin.

# This is the commit message obsproject#25:

mac-capture: Only find window by window id when owner name and pid match

# This is the commit message obsproject#26:

mac-capture: Use int in place of NSNumber for owner_pid

# This is the commit message obsproject#27:

mac-capture: update owner_pid in `update_window`

# This is the commit message obsproject#28:

CI: Add main Github Actions workflow for branch pushes and PRs

# This is the commit message obsproject#29:

UI: Remove unnecessary global variables

# This is the commit message obsproject#30:

Revert "UI: Remove unnecessary global variables"

This reverts commit f91d3ba.

From @pkv: the reason some of these vars were global is because Qt was not deleting them at all; as a result memory leaks have been reintroduced for: previewProjector, trayMenu, studioProgramProjector, multiviewProjectorMenu ;

# This is the commit message obsproject#31:

libobs-opengl: Fix viewport flip

Flip viewport in coordination with update_viewproj_matrix.

# This is the commit message obsproject#32:

UI: Add white icons for dock titles

- Add pop-out and close svg icons
- Update all dark themes qss with the new icons

# This is the commit message obsproject#33:

rtmp-services: Change Stripchat streaming service
Waik0 added a commit to Waik0/obs-studio that referenced this pull request May 1, 2020
# This is the 1st commit message:

rtmp-services: add showroom setting

# This is the commit message obsproject#2:

rtmp-services: Modify showroom setting

Change recommend format and url.
Extend curl Timeout span.

# This is the commit message obsproject#3:

rtmp-services: remove unused code

# This is the commit message obsproject#4:

rtmp-services: showroom support autoconfig ui

# This is the commit message obsproject#5:

rtmp-services: clang format

# This is the commit message obsproject#6:

rtmp-services: Add WASDTV (obsproject#2697)


# This is the commit message obsproject#7:

CI: Add freetype dep on osx


# This is the commit message obsproject#8:

libobs: Fix plugin folder search path case on macOS

# This is the commit message obsproject#9:

linux-v4l2: Fix build with Clang 10.0

add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value

# This is the commit message obsproject#10:

CI: Add qt5-xml package for FreeBSD build task

# This is the commit message obsproject#11:

rtmp-services: Update ChathostessModels service (obsproject#2745)


# This is the commit message obsproject#12:

libobs: Don't save removed sources

# This is the commit message obsproject#13:

obs-ffmpeg: Fix media source not closing file when inactive

# This is the commit message obsproject#14:

obs-browser: Fix formatting

# This is the commit message obsproject#15:

obs-vst: Fix formatting

# This is the commit message obsproject#16:

obs-qsv11: Enable QSV texture-based encoding

Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.

# This is the commit message obsproject#17:

UI: Remove all scenes in ClearSceneData

# This is the commit message obsproject#18:

UI: Fix previewLabel styling

Label renders with default styling instead of using dynamic property
because it was already polished.

# This is the commit message obsproject#19:

docs/sphinx: Add Property Grouping

# This is the commit message obsproject#20:

plugins: Build ALSA plugin for FreeBSD

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

# This is the commit message obsproject#21:

UI: Adjust a few margins

-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.

# This is the commit message obsproject#22:

UI: Add status icons for recording and streaming

# This is the commit message obsproject#23:

CMake: Build Windows modules with file descriptors

# This is the commit message obsproject#24:

mac-capture: Use window id to identify windows on MacOS

Use a window's window id in init_window in the mac window capture plugin.

# This is the commit message obsproject#25:

mac-capture: Only find window by window id when owner name and pid match

# This is the commit message obsproject#26:

mac-capture: Use int in place of NSNumber for owner_pid

# This is the commit message obsproject#27:

mac-capture: update owner_pid in `update_window`

# This is the commit message obsproject#28:

CI: Add main Github Actions workflow for branch pushes and PRs

# This is the commit message obsproject#29:

UI: Remove unnecessary global variables

# This is the commit message obsproject#30:

Revert "UI: Remove unnecessary global variables"

This reverts commit f91d3ba.

From @pkv: the reason some of these vars were global is because Qt was not deleting them at all; as a result memory leaks have been reintroduced for: previewProjector, trayMenu, studioProgramProjector, multiviewProjectorMenu ;

# This is the commit message obsproject#31:

libobs-opengl: Fix viewport flip

Flip viewport in coordination with update_viewproj_matrix.

# This is the commit message obsproject#32:

UI: Add white icons for dock titles

- Add pop-out and close svg icons
- Update all dark themes qss with the new icons

# This is the commit message obsproject#33:

rtmp-services: Change Stripchat streaming service

# This is the commit message obsproject#34:

rtmp-services: Add VirtWish service

# This is the commit message obsproject#35:

UI: Update OSX to macOS in English translation

# This is the commit message obsproject#36:

obs-browser, obs-vst: Fix formatting

# This is the commit message obsproject#37:

CI: Fix Azure Pipelines macOS runs

# This is the commit message obsproject#38:

obs-filters: Add a user label to the LUT filter

While discussing the Flatpak RFC [1], it was spotted that the
LUT filter couldn't open the file selection dialog. It was
explained, then, that the proper formats were either composed
of "User Label (file extensions)", or "file extensions", and
the LUT filter was setting "(file extensions)" without the
actual user label.

While this works on a standard Qt file selection dialog, it
cannot be properly formatted as a set of D-Bus filters, thus
breaking the sandbox integration.

Add a simple user label to the LUT file filter.

[1] obsproject/rfcs#21 (comment)

# This is the commit message obsproject#39:

UI: Remove requirement for replay buffer hotkey

Fixes obsproject#2807

# This is the commit message obsproject#40:

obs-ffmpeg: Log why new NVENC might not be used

# This is the commit message obsproject#41:

obs-ffmpeg: Preserve error message from new NVENC

If we fallback to ffmpeg NVENC, the error from new NVENC might still be
present in the encoder structure. Given that this provides a lot more
actionable information to the user, let's use it if possible.

# This is the commit message obsproject#42:

libobs: Clear last error on encoder shutdown

This fixes an issue where an encoder may error out on a path that
doesn't use obs_encoder_set_last_error, resulting in a stale error being
used.

# This is the commit message obsproject#43:

obs-ffmpeg: Add localization for NVENC error messages

# This is the commit message obsproject#44:

obs-ffmpeg: Add error message for non-zero GPU

# This is the commit message obsproject#45:

CI: Update macOS deps to fix lua

# This is the commit message obsproject#46:

vlc-video: Enable building the plugin on FreeBSD
cpyarger added a commit to cpyarger/obs-studio that referenced this pull request Jul 4, 2020
WizardCM pushed a commit to WizardCM/obs-studio that referenced this pull request Feb 13, 2022
kc5nra pushed a commit to amazon-contributing/upstreaming-to-obs-studio that referenced this pull request Jan 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants