smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: deskflow/Clipboard, do not assert instead handle the cases where we would have asserted to fail safely

Browse source
This commit is contained in:
sithlord48 2025-04-07 22:11:42 -04:00 committed by Nick Bolton
parent cd7d53d2bd
commit 64b277a5df
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/lib/deskflow/Clipboard.cpp
View file

@ -25,7 +25,8 @@ Clipboard::~Clipboard()
bool Clipboard::empty() bool Clipboard::empty()
{ {
assert(m_open); if (!m_open)
return false;
// clear all data // clear all data
for (int32_t index = 0; index < kNumFormats; ++index) { for (int32_t index = 0; index < kNumFormats; ++index) {
@ -44,8 +45,8 @@ bool Clipboard::empty()
void Clipboard::add(EFormat format, const std::string &data) void Clipboard::add(EFormat format, const std::string &data)
{ {
assert(m_open); if (!m_open || !m_owner)
assert(m_owner); return;
m_data[format] = data; m_data[format] = data;
m_added[format] = true; m_added[format] = true;
@ -53,8 +54,8 @@ void Clipboard::add(EFormat format, const std::string &data)
bool Clipboard::open(Time time) const bool Clipboard::open(Time time) const
{ {
assert(!m_open); if (m_open)
return true;
m_open = true; m_open = true;
m_time = time; m_time = time;
@ -63,8 +64,6 @@ bool Clipboard::open(Time time) const
void Clipboard::close() const void Clipboard::close() const
{ {
assert(m_open);
m_open = false; m_open = false;
} }
@ -75,13 +74,15 @@ Clipboard::Time Clipboard::getTime() const
bool Clipboard::has(EFormat format) const bool Clipboard::has(EFormat format) const
{ {
assert(m_open); if (!m_open)
return false;
return m_added[format]; return m_added[format];
} }
std::string Clipboard::get(EFormat format) const std::string Clipboard::get(EFormat format) const
{ {
assert(m_open); if (!m_open)
return "";
return m_data[format]; return m_data[format];
} }