Default to main canvas in scene selection
Some checks are pending
debian-build / build (push) Waiting to run
Check locale / ubuntu64 (push) Waiting to run
Push to master / Check Formatting 🔍 (push) Waiting to run
Push to master / Build Project 🧱 (push) Waiting to run
Push to master / Create Release 🛫 (push) Blocked by required conditions

New scene selections would have no canvas selected at all.
This would cause issues in places which do not support an empty canvas
selection.

For example, the "scene changed" check of the scene condition would not
work as without any canvas it is not clear which scene to check for.
This commit is contained in:
WarmUpTill 2025-12-03 19:59:47 +01:00 committed by WarmUpTill
parent 246667e65e
commit 03f67534c7
4 changed files with 13 additions and 5 deletions

View File

@ -297,6 +297,12 @@ int GetIndexOfScene(const OBSWeakCanvas &weakCanvas, const OBSWeakSource &scene)
return data.idx;
}
OBSWeakCanvas GetMainCanvas()
{
OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
return OBSGetWeakRef(mainCanvas);
}
#if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(31, 1, 0)
obs_canvas_t *obs_canvas_get_ref(obs_canvas_t *)

View File

@ -42,6 +42,7 @@ EXPORT OBSWeakSource GetActiveCanvasScene(const OBSWeakCanvas &canvas);
EXPORT OBSWeakSource GetSceneAtIndex(const OBSWeakCanvas &weakCanvas, int idx);
EXPORT int GetIndexOfScene(const OBSWeakCanvas &weakCanvas,
const OBSWeakSource &scene);
EXPORT OBSWeakCanvas GetMainCanvas();
class CanvasSelection : public FilterComboBox {
Q_OBJECT

View File

@ -103,10 +103,11 @@ void SceneSelection::Load(obs_data_t *obj, const char *name,
OBSDataAutoRelease data =
obs_data_get_obj(obj, selectionSaveName.data());
if (obs_data_has_user_value(data, canvasSaveName.data())) {
_canvas = GetWeakCanvasByName(
obs_data_get_string(data, canvasSaveName.data()));
} else {
const char *canvasName =
obs_data_get_string(data, canvasSaveName.data());
_canvas = GetWeakCanvasByName(
obs_data_get_string(data, canvasSaveName.data()));
if (strcmp(canvasName, "") == 0) {
OBSCanvasAutoRelease mainCanvas = obs_get_main_canvas();
_canvas = obs_canvas_get_weak_canvas(mainCanvas);
obs_weak_canvas_release(_canvas);

View File

@ -30,7 +30,7 @@ public:
private:
OBSWeakSource _scene;
OBSWeakCanvas _canvas;
OBSWeakCanvas _canvas = GetMainCanvas();
SceneGroup *_group = nullptr;
std::weak_ptr<Variable> _variable;
Type _type = Type::SCENE;