Merge branch 'master' of github.com:lasconic/MuseScore

README.md

@@ -4,7 +4,6 @@ MuseScore [![Build Status](https://secure.travis-ci.org/musescore/MuseScore.png)
 
 MuseScore [free music notation software](http://musescore.org). http://musescore.org
 
->>>>>>> ecabd2aa890bcbada78bfcb18e29019e9caa65a2
 * **aeolus** Clone of [Aeolus](http://users.skynet.be/solaris/linuxaudio/aeolus.html)
 
 * **awl** Audio Widget Library, from the MusE project

libmscore/select.cpp

@@ -262,7 +262,7 @@ void Selection::updateSelectedElements()
                               continue;
                         if (sp->endElement()->type() == SEGMENT) {
                               Segment* s2 = static_cast<Segment*>(sp->endElement());
-                              if (s2->tick() < _endSegment->tick())
+                              if (_endSegment && (s2->tick() < _endSegment->tick()))
                                     add(sp);
                               }
                         else {

mscore/musescore.cpp

@@ -270,7 +270,7 @@ void MuseScore::closeEvent(QCloseEvent* ev)
       ev->accept();
       if (preferences.dirty)
             preferences.write();
-//      this->deleteLater();     !?
+      this->deleteLater();     //this is necessary on windows http://musescore.org/node/16713
       qApp->quit();
       }
 
@@ -2291,6 +2291,10 @@ int main(int argc, char* av[])
       MScore::PDPI = wi.logicalDpiX();         // physical resolution
       MScore::DPI  = MScore::PDPI;             // logical drawing resolution
       MScore::init();                          // initialize libmscore
+
+      if (MScore::debugMode)
+            printf("DPI %f\n", MScore::DPI);
+
       preferences.readDefaultStyle();
 
       if (!useFactorySettings)

mtest/libmscore/beam/Beam-B.mscx

@@ -964,7 +964,7 @@
           </Chord>
         <Beam id="37">
           <StemDirection>down</StemDirection>
-          <l1>22</l1>
+          <l1>23</l1>
           <l2>27</l2>
           </Beam>
         <Chord>

mtest/libmscore/beam/Beam-dir.mscx

@@ -374,8 +374,8 @@
             </Note>
           </Chord>
         <Beam id="8">
-          <l1>-8</l1>
-          <l2>-3</l2>
+          <l1>19</l1>
+          <l2>24</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>

mtest/libmscore/compat/notes-ref.mscx

@@ -313,8 +313,8 @@ p, li { white-space: pre-wrap; }
             </Note>
           </Chord>
         <Beam id="5">
-          <l1>5</l1>
-          <l2>1</l2>
+          <l1>1</l1>
+          <l2>-3</l2>
           </Beam>
         <Chord>
           <durationType>32nd</durationType>
@@ -349,8 +349,8 @@ p, li { white-space: pre-wrap; }
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>-3</l1>
-          <l2>-7</l2>
+          <l1>-7</l1>
+          <l2>-11</l2>
           </Beam>
         <Chord>
           <durationType>32nd</durationType>