3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'vk-bugfixes'

Browse source
This commit is contained in:
Vojtech Kral 2019-09-06 15:29:29 +02:00
commit fec1113020
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
* 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);
return baud;
@ -110,7 +110,7 @@ static int ser_setspeed(union filedescriptor *fd, long baud)
*/
rc = tcgetattr(fd->ifd, &termios);
if (rc < 0) {
avrdude_message(MSG_INFO, "%s: ser_setspeed(): tcgetattr() failed",
avrdude_message(MSG_INFO, "%s: ser_setspeed(): tcgetattr() failed\n",
progname);
return -errno;
}

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

@ -789,16 +789,11 @@ void ObjectList::OnContextMenu(wxDataViewEvent&)
void ObjectList::list_manipulation()
{
wxDataViewItem item;
wxDataViewColumn* col;
wxDataViewColumn* col = nullptr;
const wxPoint pt = get_mouse_position_in_control();
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) {
printf("undefined item\n");
if (!item || col == nullptr) {
return;
}