Skip to content

Commit

Permalink
fix #3185 and #4689
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n authored and alexbruy committed Dec 25, 2011
1 parent 78379f6 commit 2b39c0f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/app/gps/qgsgpsinformationwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ void QgsGPSInformationWidget::connectGps()

if ( mRadUserPath->isChecked() )
{
port = mCboDevices->itemData( mCboDevices->currentIndex() ).toString();
port = mCboDevices->currentText();

if ( port.isEmpty() )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/gps/qextserialport/qextserialenumerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ QextSerialEnumerator::~QextSerialEnumerator( )
infoList.append(info);

CloseHandle( hPort );
}
}
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/gps/qgsgpsdetector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()
QgsGPSDetector::QgsGPSDetector( QString portName )
{
mConn = 0;
mBaudList << BAUD4800 << BAUD9600 << BAUD38400;
mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600 << BAUD115200; //add 57600 for SXBlueII GPS unit

if ( portName.isEmpty() )
{
Expand Down
3 changes: 3 additions & 0 deletions src/ui/qgsgpsinformationwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
Expand Down

0 comments on commit 2b39c0f

Please sign in to comment.