Skip to content

Commit

Permalink
Merge branch 'main' into napfft
Browse files Browse the repository at this point in the history
  • Loading branch information
cklosters authored Aug 14, 2024
2 parents 647f527 + 55976c0 commit ee3df1d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions core/src/nap/signalslot.h
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ namespace nap
{
disconnect();
copyCauses(other);
mFunction = other.mFunction;
other.disconnect();
other.mFunction = nullptr;
return *this;
}

Expand All @@ -382,6 +384,7 @@ namespace nap
{
disconnect();
copyCauses(other);
mFunction = other.mFunction;
return *this;
}

Expand Down

6 comments on commit ee3df1d

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Linux Build 239 is now running

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Win64 Build 241 is now running

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Linux Build 239 outcome was SUCCESS
Summary: Running Build time: 00:32:54

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Win64 Build 241 outcome was SUCCESS
Summary: Running Build time: 00:16:39

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Raspberry Pi Build 1714 is now running

@cklosters
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Public / Package NAP Raspberry Pi Build 1714 outcome was SUCCESS
Summary: Running Build time: 02:00:07

Please sign in to comment.