fix: work on aquamarine backend #54
Conversation
src/VirtualDesk.cpp
Outdated
| @@ -184,5 +184,5 @@ Layout VirtualDesk::generateCurrentMonitorLayout() { | |||
| std::string VirtualDesk::monitorDesc(const CMonitor* monitor) { | |||
| if (!monitor->output) | |||
| return monitor->szName; | |||
| return monitor->output->description ? monitor->output->description : monitor->szName; | |||
| return monitor->output->description; | |||
There was a problem hiding this comment.
I think this should actually be:
| return monitor->output->description; | |
| return monitor->output->description.empty() ? monitor->szName : monitor->output->description; |
There was a problem hiding this comment.
Yes you're right. I thought the description is always set.
Additionally, I've found the monitor->szDescription field exists. This should be the same as the monitor->output->description but at the convenience we don't have to go over the output which is more likely to have breaking changes
|
Ah also, I see you're merging directly into main, could you merge into dev instead? Thanks 🙏 |
Thanks for the reminder, I totally forgot to change the target branch Somehow, yesterday the build succeeded without installing aquamarine. I've now added the |
The new
aquamarinebackend no longer uses an char pointer array but the string from the standard library which cannot be a nullptr