amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

Browse source
This commit is contained in:
Enrico Turri 2019-09-06 17:25:39 +02:00
commit 5b60fe272a
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/avrdude/ser_posix.c
View file

@ -90,7 +90,7 @@ static speed_t serial_baud_lookup(long baud)
* If a non-standard BAUD rate is used, issue * If a non-standard BAUD rate is used, issue
* a warning (if we are verbose) and return the raw rate * a warning (if we are verbose) and return the raw rate
*/ */
avrdude_message(MSG_NOTICE, "%s: serial_baud_lookup(): Using non-standard baud rate: %ld", avrdude_message(MSG_NOTICE, "%s: serial_baud_lookup(): Using non-standard baud rate: %ld\n",
progname, baud); progname, baud);
return baud; return baud;
@ -110,7 +110,7 @@ static int ser_setspeed(union filedescriptor *fd, long baud)
*/ */
rc = tcgetattr(fd->ifd, &termios); rc = tcgetattr(fd->ifd, &termios);
if (rc < 0) { if (rc < 0) {
avrdude_message(MSG_INFO, "%s: ser_setspeed(): tcgetattr() failed", avrdude_message(MSG_INFO, "%s: ser_setspeed(): tcgetattr() failed\n",
progname); progname);
return -errno; return -errno;
} }

9
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -789,16 +789,11 @@ void ObjectList::OnContextMenu(wxDataViewEvent&)
void ObjectList::list_manipulation() void ObjectList::list_manipulation()
{ {
wxDataViewItem item; wxDataViewItem item;
wxDataViewColumn* col; wxDataViewColumn* col = nullptr;
const wxPoint pt = get_mouse_position_in_control(); const wxPoint pt = get_mouse_position_in_control();
HitTest(pt, item, col); HitTest(pt, item, col);
#ifdef __WXOSX__ // temporary workaround for OSX
// after Yosemite OS X version, HitTest return undefined item
if (!item) item = GetSelection();
#endif // __WXOSX__
if (!item) { if (!item || col == nullptr) {
printf("undefined item\n");
return; return;
} }