Browse Source

Misc fixing

tags/1.9.4
falkTX 11 years ago
parent
commit
606b57646a
2 changed files with 8 additions and 1 deletions
  1. +7
    -0
      source/backend/plugin/CarlaPluginUi.cpp
  2. +1
    -1
      source/includes/lv2/atom-forge.h

+ 7
- 0
source/backend/plugin/CarlaPluginUi.cpp View File

@@ -180,7 +180,11 @@ bool CarlaPluginUi::tryTransientWinIdMatch(const ulong pid, const char* const ui
CARLA_SAFE_ASSERT_RETURN(winId != 0, true); CARLA_SAFE_ASSERT_RETURN(winId != 0, true);


#if defined(CARLA_OS_MAC) #if defined(CARLA_OS_MAC)
return true;
(void)pid;
#elif defined(CARLA_OS_WIN) #elif defined(CARLA_OS_WIN)
return true;
(void)pid;
#elif defined(HAVE_X11) #elif defined(HAVE_X11)
struct ScopedDisplay { struct ScopedDisplay {
Display* display; Display* display;
@@ -286,6 +290,9 @@ bool CarlaPluginUi::tryTransientWinIdMatch(const ulong pid, const char* const ui
XSetTransientForHint(sd.display, lastGoodWindow, (Window)winId); XSetTransientForHint(sd.display, lastGoodWindow, (Window)winId);
XFlush(sd.display); XFlush(sd.display);
return true; return true;
#else
return true;
(void)pid;
#endif #endif
} }




+ 1
- 1
source/includes/lv2/atom-forge.h View File

@@ -302,7 +302,7 @@ lv2_atom_forge_raw(LV2_Atom_Forge* forge, const void* data, uint32_t size)
if (forge->sink) { if (forge->sink) {
out = forge->sink(forge->handle, data, size); out = forge->sink(forge->handle, data, size);
} else { } else {
out = (LV2_Atom_Forge_Ref)forge->buf + forge->offset;
out = (LV2_Atom_Forge_Ref)(forge->buf + forge->offset);
uint8_t* mem = forge->buf + forge->offset; uint8_t* mem = forge->buf + forge->offset;
if (forge->offset + size > forge->size) { if (forge->offset + size > forge->size) {
return 0; return 0;


Loading…
Cancel
Save